Request 3713 (accepted)

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -55,11 +55,14 @@
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Source20:       crossguid-8f399e8bd4.tar.gz
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
+Source21:       libdvdnav-master.tar.gz
+Source22:       libdvdcss-master.tar.gz
+Source23:       libdvdread-master.tar.gz
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
 Patch4:         add_rpi2_support.patch
-Patch5:         disable_internal_libdvd.patch
 #Patch6:         kodi.cximage.gcc6.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
@@ -87,9 +90,6 @@
 %ifarch %ix86 x86_64
 BuildRequires:  libcrystalhd-devel
 %endif
-BuildRequires:  libdvdcss-devel
-BuildRequires:  libdvdnav-devel
-BuildRequires:  libdvdread-devel
 BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -252,7 +252,6 @@
 %patch2
 %patch3
 %patch4 -p0
-%patch5
 #%patch6 -p1
 
 # Remove build time references so build-compare can do its work
@@ -276,6 +275,9 @@
     xbmc/linux/*.cpp
 
 cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdnav
+cp %{SOURCE22} tools/depends/target/libdvdcss
+cp %{SOURCE23} tools/depends/target/libdvdread
 
 %build
 
@@ -359,6 +361,7 @@
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi

kodi-noX-raspberry-pi2.spec Changed

@@ -55,11 +55,14 @@
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Source20:       crossguid-8f399e8bd4.tar.gz
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
+Source21:       libdvdnav-master.tar.gz
+Source22:       libdvdcss-master.tar.gz
+Source23:       libdvdread-master.tar.gz
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
 Patch4:         add_rpi2_support.patch
-Patch5:         disable_internal_libdvd.patch
 #Patch6:         kodi.cximage.gcc6.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
@@ -87,9 +90,6 @@
 %ifarch %ix86 x86_64
 BuildRequires:  libcrystalhd-devel
 %endif
-BuildRequires:  libdvdcss-devel
-BuildRequires:  libdvdnav-devel
-BuildRequires:  libdvdread-devel
 BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -252,7 +252,6 @@
 %patch2
 %patch3
 %patch4 -p0
-%patch5
 #%patch6 -p1
 
 # Remove build time references so build-compare can do its work
@@ -276,6 +275,9 @@
     xbmc/linux/*.cpp
 
 cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdnav
+cp %{SOURCE22} tools/depends/target/libdvdcss
+cp %{SOURCE23} tools/depends/target/libdvdread
 
 %build
 
@@ -359,6 +361,7 @@
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi

kodi-noX.spec Changed

@@ -55,11 +55,14 @@
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Source20:       crossguid-8f399e8bd4.tar.gz
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
+Source21:       libdvdnav-master.tar.gz
+Source22:       libdvdcss-master.tar.gz
+Source23:       libdvdread-master.tar.gz
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
 Patch4:         add_rpi2_support.patch
-Patch5:         disable_internal_libdvd.patch
 #Patch6:         kodi.cximage.gcc6.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
@@ -87,9 +90,6 @@
 %ifarch %ix86 x86_64
 BuildRequires:  libcrystalhd-devel
 %endif
-BuildRequires:  libdvdcss-devel
-BuildRequires:  libdvdnav-devel
-BuildRequires:  libdvdread-devel
 BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -252,7 +252,6 @@
 %patch2
 %patch3
 %patch4 -p0
-%patch5
 #%patch6 -p1
 
 # Remove build time references so build-compare can do its work
@@ -276,6 +275,9 @@
     xbmc/linux/*.cpp
 
 cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdnav
+cp %{SOURCE22} tools/depends/target/libdvdcss
+cp %{SOURCE23} tools/depends/target/libdvdread
 
 %build
 
@@ -359,6 +361,7 @@
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi

kodi.spec Changed

@@ -55,11 +55,14 @@
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Source20:       crossguid-8f399e8bd4.tar.gz
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
+Source21:       libdvdnav-master.tar.gz
+Source22:       libdvdcss-master.tar.gz
+Source23:       libdvdread-master.tar.gz
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
 Patch4:         add_rpi2_support.patch
-Patch5:         disable_internal_libdvd.patch
 #Patch6:         kodi.cximage.gcc6.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
@@ -87,9 +90,6 @@
 %ifarch %ix86 x86_64
 BuildRequires:  libcrystalhd-devel
 %endif
-BuildRequires:  libdvdcss-devel
-BuildRequires:  libdvdnav-devel
-BuildRequires:  libdvdread-devel
 BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -252,7 +252,6 @@
 %patch2
 %patch3
 %patch4 -p0
-%patch5
 #%patch6 -p1
 
 # Remove build time references so build-compare can do its work
@@ -276,6 +275,9 @@
     xbmc/linux/*.cpp
 
 cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdnav
+cp %{SOURCE22} tools/depends/target/libdvdcss
+cp %{SOURCE23} tools/depends/target/libdvdread
 
 %build
 
@@ -359,6 +361,7 @@
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi

libdvdnav-no-return.patch Added

@@ -0,0 +1,40 @@
+--- src/vm/vmget.c.orig	2017-02-27 22:43:29.493007671 +0200
++++ src/vm/vmget.c	2017-02-27 22:46:49.717611551 +0200
+@@ -311,6 +311,7 @@
+ }
+ 
+ video_attr_t vm_get_video_attr(vm_t *vm) {
++  video_attr_t empty = {0,};
+   switch ((vm->state).domain) {
+   case DVD_DOMAIN_VTSTitle:
+     return vm->vtsi->vtsi_mat->vts_video_attr;
+@@ -322,9 +323,11 @@
+   default:
+     assert(0);
+   }
++  return empty;
+ }
+ 
+ audio_attr_t vm_get_audio_attr(vm_t *vm, int streamN) {
++  audio_attr_t empty = {0,};
+   switch ((vm->state).domain) {
+   case DVD_DOMAIN_VTSTitle:
+     return vm->vtsi->vtsi_mat->vts_audio_attr[streamN];
+@@ -336,9 +339,11 @@
+   default:
+     assert(0);
+   }
++  return empty;
+ }
+ 
+ subp_attr_t vm_get_subp_attr(vm_t *vm, int streamN) {
++  subp_attr_t empty = {0,};
+   switch ((vm->state).domain) {
+   case DVD_DOMAIN_VTSTitle:
+     return vm->vtsi->vtsi_mat->vts_subp_attr[streamN];
+@@ -350,4 +355,5 @@
+   default:
+     assert(0);
+   }
++  return empty;
+ }

kodi.VERSION Changed

libdvdcss-master.tar.gz Added

libdvdnav-master.tar.gz Added

libdvdread-master.tar.gz Added

Overview

Request 3713 (accepted)

Request History