rpms/xbmc/devel xbmc-11.0-bootstrap.patch, NONE, 1.1 xbmc-11.0-dvdread.patch, NONE, 1.1 xbmc-11.0-hdhomerun.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xbmc-generate-tarball-xz.sh, 1.9, 1.10 xbmc.spec, 1.34, 1.35

Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv32760 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Added Files: xbmc-11.0-bootstrap.patch xbmc-11.0-dvdread.patch xbmc-11.0-hdhomerun.patch Log Message: Update to 11.0/Eden-beta1, rebase some patches. (Sync with git) xbmc-11.0-bootstrap.patch: bootstrap | 1 + 1 file changed, 1 insertion(+) --- NEW FILE xbmc-11.0-bootstrap.patch --- --- bootstrap.orig 2011-12-22 22:12:21.000000000 -0500 +++ bootstrap 2011-12-27 17:00:43.789624393 -0500 @@ -11,6 +11,7 @@ # order matters with libdvd and friends [ -d lib/libdvd/libdvdcss ] && \ autoreconf -vif lib/libdvd/libdvdcss +[ -d lib/libdvd/libdvdread ] && \ autoreconf -vif lib/libdvd/libdvdread autoreconf -vif lib/libdvd/libdvdnav xbmc-11.0-dvdread.patch: configure.in | 21 +-------------------- lib/libdvd/Makefile.in | 13 ++++++------- 2 files changed, 7 insertions(+), 27 deletions(-) --- NEW FILE xbmc-11.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 \ `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 \ +$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a + $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \ -Wl,--unresolved-symbols=ignore-all \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) xbmc-11.0-hdhomerun.patch: Makefile.in | 5 -- configure.in | 1 xbmc/filesystem/DllHDHomeRun.h | 78 +++++++++++++++++++++++++++-------------- 3 files changed, 53 insertions(+), 31 deletions(-) --- NEW FILE xbmc-11.0-hdhomerun.patch --- --- Makefile.in.orig 2011-12-27 18:13:13.204873013 -0500 +++ Makefile.in 2011-12-27 18:14:17.225245721 -0500 @@ -131,7 +131,6 @@ lib/cximage-6.0 \ lib/libexif \ lib/cmyth \ - lib/libhdhomerun \ lib/libid3tag \ lib/libapetag \ lib/cpluff \ @@ -267,8 +266,6 @@ $(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 @@ -293,7 +290,7 @@ $(MAKE) -C lib/cximage-6.0 codecs: papcodecs dvdpcodecs -libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so +libs: cmyth libid3tag imagelib libexif system/libcpluff-@ARCH@.so externals: codecs libs visualizations screensavers xcode_depends: \ --- configure.in.orig 2011-12-27 18:16:52.986149450 -0500 +++ configure.in 2011-12-27 18:17:09.552245330 -0500 @@ -1877,7 +1877,6 @@ lib/libexif/Makefile \ lib/libXDAAP/Makefile \ lib/cmyth/Makefile \ - lib/libhdhomerun/Makefile \ lib/libsquish/Makefile \ lib/libid3tag/Makefile \ lib/cximage-6.0/Makefile \ --- xbmc/filesystem/DllHDHomeRun.h.orig 2011-12-28 12:16:37.207493443 -0500 +++ xbmc/filesystem/DllHDHomeRun.h 2011-12-28 12:18:50.854262220 -0500 @@ -21,7 +21,7 @@ */ #include "DynamicDll.h" -#include "lib/libhdhomerun/hdhomerun.h" +#include <hdhomerun/hdhomerun.h> class DllHdHomeRunInterface { @@ -42,30 +42,56 @@ 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/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 30 Mar 2011 05:31:36 -0000 1.10 +++ .cvsignore 28 Dec 2011 21:08:39 -0000 1.11 @@ -1 +1 @@ -xbmc-10.1-patched.tar.xz +xbmc-11.0-Eden_beta1-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Mar 2011 05:31:36 -0000 1.10 +++ sources 28 Dec 2011 21:08:39 -0000 1.11 @@ -1 +1 @@ -48b245821464216f154aef16b88651f5 xbmc-10.1-patched.tar.xz +7d54a8ab03f65ad4d7cfa118a3d34796 xbmc-11.0-Eden_beta1-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xbmc-generate-tarball-xz.sh 30 Mar 2011 05:31:36 -0000 1.9 +++ xbmc-generate-tarball-xz.sh 28 Dec 2011 21:08:39 -0000 1.10 @@ -1,82 +1,64 @@ #!/bin/sh -MAJORVERSION=10.1 +MAJORVERSION=11 +MINORVERSION=0 +PRERELEASE=Eden_beta1 -# FIXME: need to update to use git -#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma +VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} -# uncomment this to switch to trunk -#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk +GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Dharma -# use SVN version number passed from script, or otherwise use default -SVNVERSION=${1-35567} +# comment-out line below if using tarball +#curl -L $GITHUBURL | tar xz -VERSION=$MAJORVERSION -# git snapshot -#VERSION=$MAJORVERSION-$SVNVERSION -# pre-release -#VERSION=Dharma_rc2 +# Repair GitHub's odd auto-generated top-level directory... +#mv xbmc-xbmc-* xbmc-$VERSION -# remove existing checkout -rm -r xbmc-$VERSION - -# don't need to extra tarball, already expanded -# comment out with tarball +# extract tarball +# comment-out if not using tarball tar -xzvf xbmc-$VERSION.tar.gz cd xbmc-$VERSION -# remove bundled libraries (including zlib and OSX), saves space and forces using external versions -# also remove legally problematic libGoAhead library -for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libhdhomerun +# remove bundled libraries, saves space and forces using external versions +for i in cximage-6.0/zlib libid3tag/zlib libhdhomerun libmpeg2 ffmpeg do - rm -r xbmc/lib/$i + rm -r lib/$i done -# bundled win32 binaries -rm -r xbmc/visualizations/XBMCProjectM/win32 - # remove more bundled codecs -# libfaad2, libmad needs upstream patches to be able to remove from tarball -# even though the bundled libaries aren't, I think, compiled -# grrr, have to keep in ffmpeg for now (2010-07-019) since upstream -# seems to require files within that subdirectory <sigh> -for i in liba52 libmpeg2 libdts +for i in libmpeg2 do - rm -r xbmc/cores/dvdplayer/Codecs/$i + rm -r xbmc/cores/dvdplayer/DVDCodecs/Video/$i done # remove DVD stuff we can't ship, or is already in external libraries for i in libdvdcss libdvdread includes do - rm -r xbmc/cores/dvdplayer/Codecs/libdvd/$i + rm -r lib/libdvd/$i done # remove all prebuilt binaries (e.g., .so files and Win32 DLLs) -find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f +find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) -print0 | xargs -0 rm -f # remove all other packages that should be system-wide # except for libass, cpluff, jsoncpp (need to figure out how to # remove these too) # xbmc-dll-symbols seems to be XBMC-specific -for i in enca freetype fribidi libcdio libcrystalhd libcurl-OSX libiconv liblame libmicrohttpd libmicrohttpd_win32 libmodplug libmysql_win32 libSDL-OSX libssh_win32 pcre libbluray libbluray_win32 librtmp bzip2 +for i in enca freetype liblame libmicrohttpd libmodplug libbluray librtmp win32 do rm -r lib/$i done # TODO/FIXME: remove tools/XBMCLive/ and other things under tools/ # also remove anything to do with win32 -for i in arm MingwBuildEnvironment PackageMaker win32buildtools XBMCLive XBMCTex +for i in arm darwin win32buildtools do rm -r tools/$i done -cd - +cd .. # repack tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION - -echo "Release:" -echo "$(date +'%Y%m%d')svn${SVNVERSION}" - Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xbmc.spec 20 Dec 2011 19:35:14 -0000 1.34 +++ xbmc.spec 28 Dec 2011 21:08:39 -0000 1.35 @@ -1,11 +1,11 @@ -#global PRERELEASE Dharma_rc2 -%global DIRVERSION %{version} +%global PRERELEASE Eden_beta1 +#global DIRVERSION %{version} # use below for pre-release -#global DIRVERSION %{PRERELEASE} +%global DIRVERSION %{version}-%{PRERELEASE} Name: xbmc -Version: 10.1 -Release: 9%{?dist} +Version: 11.0 +Release: 0.2.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -21,11 +21,11 @@ # new patches for bootstrap # no trac ticket filed as yet -Patch1: xbmc-10-bootstrap.patch +Patch1: xbmc-11.0-bootstrap.patch # filed ticket, but patch still needs work # http://trac.xbmc.org/ticket/9658 -Patch2: xbmc-10-dvdread.patch +Patch2: xbmc-11.0-dvdread.patch # and new problem with zlib in cximage # trac ticket filed: http://trac.xbmc.org/ticket/9659 @@ -34,7 +34,7 @@ # need to file trac ticket, this patch just forces external hdhomerun # functionality, needs to be able fallback internal version -Patch4: xbmc-10-hdhomerun.patch +Patch4: xbmc-11.0-hdhomerun.patch # fix "@#" in Makefile which seem to screw things up no trac filed # yet, don't know why this isn't a problem on other Linux systems @@ -123,7 +123,7 @@ BuildRequires: libtiff-devel BuildRequires: libvdpau-devel BuildRequires: libdvdread-devel -#BuildRequires: ffmpeg-devel +BuildRequires: ffmpeg-devel BuildRequires: faad2-devel BuildRequires: pulseaudio-libs-devel BuildRequires: libdca-devel @@ -134,13 +134,18 @@ BuildRequires: libmicrohttpd-devel BuildRequires: expat-devel BuildRequires: zip -%if 0%{?fedora} >= 14 BuildRequires: gettext-autopoint -%else -BuildRequires: gettext -%endif BuildRequires: librtmp-devel -BuildRequires: libbluray-devel >= 0.2.1 +BuildRequires: libbluray-devel +#BuildRequires: libbluray-devel >= 0.2.1 +BuildRequires: yajl-devel +BuildRequires: bluez-libs-devel +BuildRequires: cwiid-devel + +# nfs-utils-lib-devel package currently broken +#BuildRequires: nfs-utils-lib-devel +# afp build currently broken +#BuildRequires: afpfs-ng-devel # VAAPI currently not working, comment-out #BuildRequires: libva-freeworld-devel @@ -158,30 +163,53 @@ BuildRequires: python-sqlite2 Requires: python-sqlite2 +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %description XBMC media center is a free cross-platform media-player jukebox and entertainment hub. XBMC can play a spectrum of of multimedia formats, and featuring playlist, audio visualizations, slideshow, and weather forecast functions, together third-party plugins. +%package eventclients +Summary: Media center event client remotes + +%description eventclients +This package contains support for using XBMC with the PS3 Remote, the Wii +Remote, a J2ME based remote and the command line xbmc-send utility. + +%package eventclients-devel +Summary: Media center event client remotes development files +Requires: %{name}-eventclients = %{version}-%{release} + +%description eventclients-devel +This package contains the development header files for the eventclients +library. + %prep %setup -q -n %{name}-%{DIRVERSION} %patch1 -p0 %patch2 -p0 -%patch3 -p0 -%patch4 -p1 -%patch5 -p0 -%patch6 -p0 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 - -# Prevent rerunning the autotools. -touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \ -$(find xbmc/screensavers/rsxs-0.9 \( -name 'configure.*' -o -name 'Makefile.*' \)) +#patch3 -p0 +%patch4 -p0 +#patch5 -p0 +#patch6 -p0 +#patch7 -p1 +#patch8 -p1 +#patch9 -p1 +#patch10 -p1 %build @@ -190,16 +218,12 @@ # Can't use export nor %%configure (implies using export), because # the Makefile pile up *FLAGS in this case. -# FIXME: disable using external ffmpeg for the moment, until such time -# as either we backport a fix for 0.8 ffmpeg or we build XBMC Eden (11.x) -# --enable-external-ffmpeg ./configure \ --prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \ --libdir=%{_libdir} --datadir=%{_datadir} \ --with-lirc-device=/var/run/lirc/lircd \ --enable-goom \ ---enable-external-python \ ---disable-libdts --disable-liba52 \ +--enable-external-libraries \ --disable-dvdcss \ --disable-optimizations --disable-debug \ CPPFLAGS="-I/usr/include/ffmpeg" \ @@ -209,16 +233,12 @@ LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \ ASFLAGS=-fPIC -# disable the following: -# --enable-external-libraries -# enumerate all the external libraries because the libdts/liba52 detection -# is broken upstream: http://trac.xbmc.org/ticket/9277 - make %{?_smp_mflags} VERBOSE=1 %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +make -C tools/EventClients DESTDIR=$RPM_BUILD_ROOT install # remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/ @@ -248,7 +268,33 @@ %{_datadir}/applications/xbmc.desktop %{_datadir}/icons/hicolor/*/*/*.png +%files eventclients +%defattr(-,root,root) +%python_sitelib/xbmc +%dir %{_datadir}/pixmaps/xbmc +%{_datadir}/pixmaps/xbmc/*.png +%{_bindir}/xbmc-j2meremote +%{_bindir}/xbmc-ps3d +%{_bindir}/xbmc-ps3remote +%{_bindir}/xbmc-send +%{_bindir}/xbmc-wiiremote + +%files eventclients-devel +%defattr(-,root,root) +%dir %{_includedir}/xbmc +%{_includedir}/xbmc/xbmcclient.h + %changelog +* Wed Dec 28 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.2.Eden_beta1 +- Re-enable external ffmpeg +- Add EventClients sub-package (patch thanks to Ben Konrath <ben(a)bagu.org>) +- More spec cleaning + +* Wed Dec 28 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.1.Eden_beta1 +- Update to 11.0 beta1 +- Disable patches that are obsolete (keep around while testing) +- Update icon cache (#2097) + * Tue Dec 20 2011 Alex Lancaster <alexlan[AT] fedoraproject org> - 10.1-9 - Add patch from OpenElec distribution to fix broken YouTube plugin (should fix #1905)