Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24424 Modified Files: xbmc-generate-tarball-xz.sh xbmc.spec Added Files: xbmc-12.0-bootstrap.patch xbmc-12.0-dvdread.patch xbmc-12.0-hdhomerun.patch Removed Files: xbmc-11.0-bootstrap.patch xbmc-11.0-dvdread.patch xbmc-11.0-hdhomerun.patch Log Message: - Update to Frodo alpha 6 - Use "12.0" as version, rather than "12.8" - Drop desktop patch (now in Frodo alpha6) - Add BR for taglib-devel >= 1.8 (libid3tag is being phased out) - BR for swig and java-devel - Add CFLAGS option to recognize Samba 4.0 (in f18+) - Rebase patches to 12.0/Frodo where necessary xbmc-12.0-bootstrap.patch: bootstrap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE xbmc-12.0-bootstrap.patch --- --- bootstrap.orig 2012-10-04 15:35:08.580601064 -0400 +++ bootstrap 2012-10-04 15:35:38.067597210 -0400 @@ -11,7 +11,8 @@ # order matters with libdvd and friends [ -d lib/libdvd/libdvdcss ] && \ autoreconf -vif lib/libdvd/libdvdcss -autoreconf -vif lib/libdvd/libdvdread +[ -d lib/libdvd/libdvdread ] && \ + autoreconf -vif lib/libdvd/libdvdread autoreconf -vif lib/libdvd/libdvdnav autoreconf -vif lib/gtest xbmc-12.0-dvdread.patch: configure.in | 21 +-------------------- lib/libdvd/Makefile.in | 13 ++++++------- 2 files changed, 7 insertions(+), 27 deletions(-) --- NEW FILE xbmc-12.0-dvdread.patch --- --- configure.in.orig 2011-12-27 17:22:07.212194848 -0500 +++ configure.in 2011-12-27 17:24:56.248461555 -0500 @@ -2110,28 +2110,9 @@ --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="-D_XBMC -fPIC -DPIC" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ --- lib/libdvd/Makefile.in.orig 2011-12-27 17:26:34.728220804 -0500 +++ lib/libdvd/Makefile.in 2011-12-27 17:29:31.835558231 -0500 @@ -5,8 +5,7 @@ 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 @@ 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) @@ -48,9 +47,9 @@ $(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 +58,8 @@ 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) xbmc-12.0-hdhomerun.patch: Makefile.in | 5 -- configure.in | 1 xbmc/filesystem/DllHDHomeRun.h | 78 +++++++++++++++++++++++++++-------------- 3 files changed, 53 insertions(+), 31 deletions(-) --- NEW FILE xbmc-12.0-hdhomerun.patch --- commit 896387e8d0f501b6f46336dd5928d1e71914486c Author: Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; Date: Fri Aug 24 19:34:47 2012 -0600 Fedora: use internal hdhomerun Original patch by Alex Lancaster <alexlan[AT]fedoraproject org> diff --git a/Makefile.in b/Makefile.in index 6be215f..1120178 100755 --- a/Makefile.in +++ b/Makefile.in @@ -141,7 +141,6 @@ endif LIB_DIRS=\ lib/cximage-6.0 \ lib/libexif \ - lib/libhdhomerun \ lib/libid3tag \ lib/libapetag \ lib/cpluff \ @@ -295,8 +294,6 @@ libexif: dllloader $(MAKE) -C lib/libexif cmyth: dllloader $(MAKE) -C lib/cmyth -libhdhomerun: dllloader - $(MAKE) -C lib/libhdhomerun libid3tag: dllloader $(MAKE) -C lib/libid3tag papcodecs: dllloader dvdpcodecs @@ -322,7 +319,7 @@ imagelib: dllloader codecs: papcodecs dvdpcodecs -libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) +libs: libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) externals: codecs libs visualizations screensavers libaddon pvraddons diff --git a/configure.in b/configure.in index eabf052..948c9a9 100755 --- a/configure.in +++ b/configure.in @@ -2041,7 +2041,6 @@ OUTPUT_FILES="Makefile \ lib/libexif/Makefile \ lib/libXDAAP/Makefile \ lib/cmyth/Makefile \ - lib/libhdhomerun/Makefile \ lib/libsquish/Makefile \ lib/libid3tag/Makefile \ lib/cximage-6.0/Makefile \ diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h index 8d80cfe..a1134c5 100644 --- a/xbmc/filesystem/DllHDHomeRun.h +++ b/xbmc/filesystem/DllHDHomeRun.h @@ -21,7 +21,7 @@ */ #include "DynamicDll.h" -#include "lib/libhdhomerun/hdhomerun.h" +#include <hdhomerun/hdhomerun.h> class DllHdHomeRunInterface { @@ -42,30 +42,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: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xbmc-generate-tarball-xz.sh 25 Mar 2012 21:26:26 -0000 1.14 +++ xbmc-generate-tarball-xz.sh 4 Oct 2012 23:37:23 -0000 1.15 @@ -1,25 +1,27 @@ #!/bin/sh -MAJORVERSION=11 +MAJORVERSION=12 MINORVERSION=0 -#PRERELEASE=Eden_rc2 +PRERELEASE=Frodo_alpha6 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} -# GITHUBURL below is obsolete, I think #GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Eden +GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE -# comment-out line below if using tarball -#curl -L $GITHUBURL | tar xz +# download zipball +if [[ ! -f xbmc-$VERSION.zip ]]; then + curl -o xbmc-$VERSION.zip -L $GITHUBURL +fi + +# extract zipball +rm -r xbmc-xbmc-* +unzip xbmc-$VERSION.zip # Repair GitHub's odd auto-generated top-level directory... -#mv xbmc-xbmc-* xbmc-$VERSION +mv xbmc-xbmc-* xbmc-$VERSION -# extract tarball -# comment-out if not using tarball -tar -xzvf xbmc-$VERSION.tar.gz - -cd xbmc-$VERSION +pushd xbmc-$VERSION # remove bundled libraries, saves space and forces using external versions # grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream @@ -62,7 +64,7 @@ rm -r tools/$i done -cd .. +popd # repack tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- xbmc.spec 4 Oct 2012 21:49:02 -0000 1.52 +++ xbmc.spec 4 Oct 2012 23:37:23 -0000 1.53 @@ -1,6 +1,6 @@ %global PRERELEASE Frodo_alpha6 #global DIRVERSION %{version} -# use below for pre-release +# use the line below for pre-releases %global DIRVERSION %{version}-%{PRERELEASE} Name: xbmc @@ -158,6 +158,8 @@ %endif BuildRequires: taglib-devel >= 1.8 BuildRequires: swig +BuildRequires: java-devel +BuildRequires: lame-devel # nfs-utils-lib-devel package currently broken #BuildRequires: nfs-utils-lib-devel @@ -245,11 +247,12 @@ --with-lirc-device=/var/run/lirc/lircd \ --enable-goom \ --enable-external-libraries \ +--enable-pulse \ --disable-dvdcss \ --disable-optimizations --disable-debug \ CPPFLAGS="-I/usr/include/ffmpeg" \ -CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ -CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ +CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \ +CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \ LDFLAGS="-fPIC" \ LIBS="-L%{_libdir}/mysql %{?_with_hdhomerun:-lhdhomerun} $LIBS" \ ASFLAGS=-fPIC @@ -291,7 +294,7 @@ %files %defattr(-,root,root) -%doc copying.txt keymapping.txt LICENSE.GPL README +%doc copying.txt CONTRIBUTORS LICENSE.GPL README %doc docs %{_bindir}/xbmc %{_bindir}/xbmc-standalone @@ -323,7 +326,8 @@ - Use "12.0" as version, rather than "12.8" - Drop desktop patch (now in Frodo alpha6) - Add BR for taglib-devel >= 1.8 (libid3tag is being phased out) -- BR for swig +- BR for swig and java-devel +- 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 --- xbmc-11.0-bootstrap.patch DELETED --- --- xbmc-11.0-dvdread.patch DELETED --- --- xbmc-11.0-hdhomerun.patch DELETED ---