Author: ktdreyer Update of /cvs/free/rpms/xbmc/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26009 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Added Files: xbmc-12.2-dvdread.patch xbmc-12.2-hdhomerun.patch Removed Files: xbmc-10-disable-zlib-in-cximage.patch xbmc-12.0-bootstrap.patch xbmc-12.0-dvdread.patch xbmc-12.0-fix-crash-on-player-stop.patch xbmc-12.0-fix-pa-buffer-overruns.patch xbmc-12.0-hdhomerun.patch Log Message: * Mon May 06 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.2-1 - Update to Frodo 12.2 - Rebase hdhomerun and dvdread patches onto 12.2 - Drop upstreamed PA patches - Drop unused cximage zlib patch xbmc-12.2-dvdread.patch: bootstrap.mk | 5 ----- configure.in | 21 +-------------------- lib/libdvd/Makefile.in | 20 +++++++------------- 3 files changed, 8 insertions(+), 38 deletions(-) --- NEW FILE xbmc-12.2-dvdread.patch --- commit 9f9845af842a376d5bdf70742785e7727695fd03 Author: Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; Date: Mon May 6 17:07:40 2013 -0600 Fedora: use external dvdread Original patch by Alex Lancaster <alexlan[AT]fedoraproject org> diff --git a/bootstrap.mk b/bootstrap.mk index 8bc4795..1fc31a4 100644 --- a/bootstrap.mk +++ b/bootstrap.mk @@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),) BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac DVD_CSS=lib/libdvd/libdvdcss/configure endif -BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac ifneq ($(wildcard pvr-addons/Makefile.am),) @@ -18,10 +17,6 @@ endif BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS)) all: $(BOOTSTRAP_TARGETS) -#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav. -lib/libdvd/libdvdread/configure: $(DVD_CSS) -lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure - %: %.ac autoreconf -vif $(@D) -@rm -rf $((a)D)/autom4te.cache diff --git a/configure.in b/configure.in index e98cc95..e922043 100644 --- a/configure.in +++ b/configure.in @@ -2616,28 +2616,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ --with-pic ], [$SKIP_CONFIG_DVDCSS]) -XB_CONFIG_MODULE([lib/libdvd/libdvdread], [ - ./configure2 \ - --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \ - --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ - --host=$host_alias \ - --build=$build_alias \ - --target=$target_alias \ - --enable-static \ - --disable-shared \ - --disable-strip \ - --disable-opts \ - --cc="$CC" && - $MAKE dvdread-config && - mkdir -p `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread -], [0]) - XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ ./configure2 \ - --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \ - --extra-ldflags="-L`pwd`/../libdvdread/obj" \ - --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ + --extra-cflags="$CFLAGS -fPIC -DPIC" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in index 69d2286..1f5eebb 100644 --- a/lib/libdvd/Makefile.in +++ b/lib/libdvd/Makefile.in @@ -5,8 +5,7 @@ CXX=@CXX@ SYSDIR=@abs_top_srcdir@/system/players/dvdplayer SOS= libdvdnav-$(ARCH).so -DIRS= libdvdread \ - libdvdnav +DIRS= libdvdnav WRAPPER=@abs_top_srcdir(a)/xbmc/cores/DllLoader/exports/wrapper.o WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias @@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al ifeq ($(findstring osx,$(ARCH)),osx) LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress else -LDFLAGS += -shared -fPIC -rdynamic +LDFLAGS += -shared -fPIC -rdynamic -ldvdread endif ifeq ($(ARCH), powerpc-osx) @@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS)) DISTCLEAN_FILES=includes/dvdread/*.h \ includes/dvdcss/*.h \ - libdvdnav/config.h \ - libdvdread/config.h + libdvdnav/config.h .PHONY: $(DIRS) compile @@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ $(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O) -$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a +$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ - $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O) + $(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O) else @@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) -$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a - $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \ +$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \ -Wl,--unresolved-symbols=ignore-all \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) @@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss; libdvdcss: compile $(MAKE) -C $@ -libdvdread/obj/libdvdread.a: libdvdread; -libdvdread: compile - $(MAKE) -C $@ - libdvdnav/obj/libdvdnav.a: libdvdnav; libdvdnav: compile $(MAKE) -C $@ xbmc-12.2-hdhomerun.patch: Makefile.in | 5 -- configure.in | 1 xbmc/filesystem/DllHDHomeRun.h | 78 +++++++++++++++++++++++++++-------------- 3 files changed, 53 insertions(+), 31 deletions(-) --- NEW FILE xbmc-12.2-hdhomerun.patch --- commit ef5c269992b32d67de7547e9f530b6c971381f45 Author: Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; Date: Fri Aug 24 19:34:47 2012 -0600 Fedora: use external hdhomerun Original patch by Alex Lancaster <alexlan[AT]fedoraproject org> diff --git a/Makefile.in b/Makefile.in index 39dc6f9..79877b4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -179,7 +179,6 @@ endif LIB_DIRS=\ lib/cximage-6.0 \ lib/libexif \ - lib/libhdhomerun \ lib/cpluff \ lib/xbmc-dll-symbols @@ -352,8 +351,6 @@ libexif: dllloader $(MAKE) -C lib/libexif cmyth: dllloader $(MAKE) -C lib/cmyth -libhdhomerun: dllloader - $(MAKE) -C lib/libhdhomerun papcodecs: dllloader dvdpcodecs test -d system/players/paplayer || mkdir system/players/paplayer $(MAKE) -C lib/xbadpcm @@ -382,7 +379,7 @@ endif codecs: papcodecs dvdpcodecs -libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) +libs: imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) externals: codecs libs visualizations screensavers libaddon pvraddons diff --git a/configure.in b/configure.in index e922043..b61f0dd 100644 --- a/configure.in +++ b/configure.in @@ -2331,7 +2331,6 @@ OUTPUT_FILES="Makefile \ lib/libexif/Makefile \ lib/libXDAAP/Makefile \ lib/cmyth/Makefile \ - lib/libhdhomerun/Makefile \ lib/libsquish/Makefile \ lib/cximage-6.0/Makefile \ lib/addons/script.module.pil/Makefile \ diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h index 1667fde..48bdae3 100644 --- a/xbmc/filesystem/DllHDHomeRun.h +++ b/xbmc/filesystem/DllHDHomeRun.h @@ -20,7 +20,7 @@ */ #include "DynamicDll.h" -#include "lib/libhdhomerun/hdhomerun.h" +#include <hdhomerun/hdhomerun.h> class DllHdHomeRunInterface { @@ -41,30 +41,56 @@ public: class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface { - DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN) - DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)) - DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2)) - DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1)) - DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1)) - DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)) - DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1)) - DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2)) - DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2)) - DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2)) - DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2)) - DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)); - BEGIN_METHOD_RESOLVE() - RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom) - RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str) - RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy) - RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start) - RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv) - RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop) - RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel) - RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program) - RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str) - RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner) - RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status) - END_METHOD_RESOLVE() +public: + virtual ~DllHdHomeRun () {}; + + virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5) + { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); } + + virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2) + { return ::hdhomerun_device_create_from_str (p1, p2); } + + virtual void device_destroy (struct hdhomerun_device_t* p1) + { ::hdhomerun_device_destroy (p1); } + + virtual int device_stream_start (struct hdhomerun_device_t* p1) + { return ::hdhomerun_device_stream_start (p1); } + + + virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3) + { + uint8_t *retval; + + size_t tmp = *p3; + retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp); + *p3 = tmp; + + return retval; + } + + virtual void device_stream_stop (struct hdhomerun_device_t* p1) + { ::hdhomerun_device_stream_stop (p1); } + + virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2) + { return ::hdhomerun_device_set_tuner_channel (p1, p2); } + + virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2) + { return ::hdhomerun_device_set_tuner_program (p1, p2); } + + + virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2) + { return ::hdhomerun_device_set_tuner_from_str (p1, p2); } + + + virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2) + { ::hdhomerun_device_set_tuner (p1, p2); } + + virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3) + { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); } + + // DLL faking. + virtual bool ResolveExports() { return true; } + virtual bool Load() { return true; } + virtual void Unload() {} }; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 27 Apr 2013 19:24:34 -0000 1.18 +++ .cvsignore 17 May 2013 15:08:34 -0000 1.19 @@ -1,2 +1,2 @@ -xbmc-12.1-patched.tar.xz +xbmc-12.2-patched.tar.xz xbmc-pvr-addons-590f862-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 27 Apr 2013 19:24:35 -0000 1.21 +++ sources 17 May 2013 15:08:34 -0000 1.22 @@ -1,2 +1,2 @@ -2823cb9a9a1a5b2d9bcbbf6b091a8236 xbmc-12.1-patched.tar.xz +c64af8503660aba9d025d6e12eaf2864 xbmc-12.2-patched.tar.xz 1b1b6234d0167e1743991ce38c6f8bf7 xbmc-pvr-addons-590f862-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-generate-tarball-xz.sh,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xbmc-generate-tarball-xz.sh 27 Apr 2013 19:24:35 -0000 1.19 +++ xbmc-generate-tarball-xz.sh 17 May 2013 15:08:34 -0000 1.20 @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=12 -MINORVERSION=1 +MINORVERSION=2 #PRERELEASE=Frodo_rc3 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/xbmc.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- xbmc.spec 27 Apr 2013 19:24:35 -0000 1.58 +++ xbmc.spec 17 May 2013 15:08:34 -0000 1.59 @@ -4,8 +4,8 @@ #global DIRVERSION %{version}-%{PRERELEASE} Name: xbmc -Version: 12.1 -Release: 2%{?dist} +Version: 12.2 +Release: 1%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -31,22 +31,12 @@ # filed ticket, but patch still needs work # http://trac.xbmc.org/ticket/9658 -Patch2: xbmc-12.0-dvdread.patch - -# and new problem with zlib in cximage -# trac ticket filed: http://trac.xbmc.org/ticket/9659 -# but patch not attached because it needs work -Patch3: xbmc-10-disable-zlib-in-cximage.patch +Patch2: xbmc-12.2-dvdread.patch # need to file trac ticket, this patch just forces external hdhomerun # functionality, needs to be able fallback internal version -Patch4: xbmc-12.0-hdhomerun.patch +Patch3: xbmc-12.2-hdhomerun.patch -# Add better support for PA. -# These patches are upstream in https://github.com/xbmc/xbmc/pull/2240, but -# they are not in the Frodo (12.x) branch. -Patch5: xbmc-12.0-fix-crash-on-player-stop.patch -Patch6: xbmc-12.0-fix-pa-buffer-overruns.patch # Optional deps (not in EPEL) # (libbluray in EPEL 6 is too old.) @@ -230,9 +220,8 @@ %setup -q -a 2 -n %{name}-%{DIRVERSION} %patch1 -p1 -%patch2 -p0 -#patch3 -p0 -%patch4 -p1 +%patch2 -p1 +%patch3 -p1 %if 0%{?_with_hdhomerun} %else @@ -338,6 +327,12 @@ #%%{_includedir}/xbmc/xbmcclient.h %changelog +* Mon May 06 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.2-1 +- Update to Frodo 12.2 +- Rebase hdhomerun and dvdread patches onto 12.2 +- Drop upstreamed PA patches +- Drop unused cximage zlib patch + * Thu Apr 25 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.1-2 - Add patches for PA (https://github.com/xbmc/xbmc/pull/2240). Fixes #2655 @@ -358,7 +353,7 @@ pre-release updates - Remove obsolete MythTV PVR add-on patch from tsp branch -* Wed Dec 27 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.4.Frodo_rc2 +* Wed Dec 26 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.4.Frodo_rc2 - Update to Frodo RC 2 - Update PVR addons snapshot to the latest Git version @@ -380,7 +375,7 @@ - Rebase HDHomeRun removal to match upstream's file names - Conditionally disable libssh BR (unavailable in EL6) -* Tue Nov 14 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.2.Frodo_alpha7 +* Mon Nov 19 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.2.Frodo_alpha7 - Add pvr addons * Tue Nov 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-0.1.Frodo_alpha7 @@ -399,7 +394,7 @@ - Add CFLAGS option to recognize Samba 4.0 (in f18+) - Rebase patches to 12.0/Frodo where necessary -* Sun Aug 28 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 12.8-0.1.Frodo_alpha4 +* Sun Aug 26 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 12.8-0.1.Frodo_alpha4 - Upgrade to Frodo alpha 4 * Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 11.0-8 --- xbmc-10-disable-zlib-in-cximage.patch DELETED --- --- xbmc-12.0-bootstrap.patch DELETED --- --- xbmc-12.0-dvdread.patch DELETED --- --- xbmc-12.0-fix-crash-on-player-stop.patch DELETED --- --- xbmc-12.0-fix-pa-buffer-overruns.patch DELETED --- --- xbmc-12.0-hdhomerun.patch DELETED ---