diff options
| -rw-r--r-- | xbmc-10-bootstrap.patch | 12 | ||||
| -rw-r--r-- | xbmc-10-dvdread.patch | 89 | ||||
| -rw-r--r-- | xbmc-11.0-bootstrap.patch | 10 | ||||
| -rw-r--r-- | xbmc-11.0-dvdread.patch | 76 | ||||
| -rw-r--r-- | xbmc-11.0-hdhomerun.patch (renamed from xbmc-10-hdhomerun.patch) | 83 | ||||
| -rwxr-xr-x | xbmc-generate-tarball-xz.sh | 60 | ||||
| -rw-r--r-- | xbmc.spec | 79 |
7 files changed, 197 insertions, 212 deletions
diff --git a/xbmc-10-bootstrap.patch b/xbmc-10-bootstrap.patch deleted file mode 100644 index bd2148b..0000000 --- a/xbmc-10-bootstrap.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- bootstrap.orig 2010-07-19 01:01:26.405392464 -0400 -+++ bootstrap 2010-07-19 01:02:03.122518706 -0400 -@@ -10,7 +10,8 @@ - # order matters with libbdnav and friends - [ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && \ - autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss --autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread -+[ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread ] && \ -+ autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread - autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav - - # Clean the generated files diff --git a/xbmc-10-dvdread.patch b/xbmc-10-dvdread.patch deleted file mode 100644 index 0d00fa1..0000000 --- a/xbmc-10-dvdread.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- configure.in.orig 2010-07-28 09:27:12.000000000 -0400 -+++ configure.in 2010-07-29 01:45:59.523143299 -0400 -@@ -1663,34 +1663,6 @@ - fi - ], [$SKIP_CONFIG_DVDCSS]) - --XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread], [ -- if test "$host_vendor" = "apple" ; then -- ./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \ -- --extra-cflags="$CFLAGS -fno-common $DVDREAD_CFLAGS -D__DARWIN__ -I`pwd`/../libdvdcss/src" \ -- --enable-static \ -- --disable-shared \ -- --cc="$CC" && -- make dvdread-config && -- mkdir -p `pwd`/../includes/dvdread -- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread -- else -- ./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 -- fi -- --], [0]) - - XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [ - if test "$host_vendor" = "apple" ; then -@@ -1703,9 +1675,7 @@ - --cc="$CC" - else - ./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" \ - --host=$host_alias \ - --build=$build_alias \ - --target=$target_alias \ ---- xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in.orig 2010-07-19 01:28:37.716268195 -0400 -+++ xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2010-07-19 01:31:10.453143936 -0400 -@@ -2,13 +2,12 @@ - ARCH=@ARCH@ - SYSDIR=../../../../../system/players/dvdplayer - SOS= libdvdnav-$(ARCH).so --DIRS= libdvdread \ -- libdvdnav -+DIRS= libdvdnav - - WRAPPER=../../../DllLoader/exports/wrapper.o - WRAPPER_OSX=../../../../../tools/Mach5/wrapper.rb - --LDFLAGS += -shared -fPIC -rdynamic -+LDFLAGS += -shared -fPIC -rdynamic -ldvdread - ifeq ($(ARCH), powerpc-osx) - # Add -lbundle1.o for powerpc-osx - BUNDLE1_O = -lbundle1.o -@@ -41,9 +40,9 @@ - libdvdcss/src/*.o $(BUNDLE1_O) - $(WRAPPER_OSX) $@;mv output.so $@ - --$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a -+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a - ld -bundle -flat_namespace -undefined suppress -o $@ \ -- $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O) -+ $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O) - $(WRAPPER_OSX) $@;mv output.so $@ - - else -@@ -52,8 +52,8 @@ - libdvdcss/src/*.o \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - --$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a -- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \ -+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a -+ $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - - endif diff --git a/xbmc-11.0-bootstrap.patch b/xbmc-11.0-bootstrap.patch new file mode 100644 index 0000000..c80aa2e --- /dev/null +++ b/xbmc-11.0-bootstrap.patch @@ -0,0 +1,10 @@ +--- 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 + diff --git a/xbmc-11.0-dvdread.patch b/xbmc-11.0-dvdread.patch new file mode 100644 index 0000000..ff98fa3 --- /dev/null +++ b/xbmc-11.0-dvdread.patch @@ -0,0 +1,76 @@ +--- 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@/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) + diff --git a/xbmc-10-hdhomerun.patch b/xbmc-11.0-hdhomerun.patch index 6fc08aa..a3ec783 100644 --- a/xbmc-10-hdhomerun.patch +++ b/xbmc-11.0-hdhomerun.patch @@ -1,46 +1,53 @@ ---- xbmc-10/Makefile.in.orig 2010-07-19 02:04:32.002268864 -0400 -+++ xbmc-10/Makefile.in 2010-07-19 02:06:30.185143439 -0400 -@@ -94,7 +94,6 @@ - LIB_DIRS=\ - xbmc/lib/cximage-6.0 \ - xbmc/lib/libexif \ -- xbmc/lib/libhdhomerun \ - xbmc/lib/libid3tag \ - xbmc/lib/libapetag \ - xbmc/lib/libPython/linux \ -@@ -340,8 +339,6 @@ - endif - libexif: dllloader - $(MAKE) -C xbmc/lib/libexif +--- 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 xbmc/lib/libhdhomerun +- $(MAKE) -C lib/libhdhomerun libid3tag: dllloader - $(MAKE) -C xbmc/lib/libid3tag + $(MAKE) -C lib/libid3tag papcodecs: dllloader dvdpcodecs -@@ -371,9 +368,9 @@ +@@ -293,7 +290,7 @@ + $(MAKE) -C lib/cximage-6.0 codecs: papcodecs dvdpcodecs - ifeq ($(findstring osx,$(ARCH)), osx) --libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-$(ARCH).so system/players/paplayer/libmodplug-$(ARCH).so -+libs: libid3tag imagelib libexif python system/libcpluff-$(ARCH).so system/players/paplayer/libmodplug-$(ARCH).so - else --libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-$(ARCH).so -+libs: libid3tag imagelib libexif python system/libcpluff-$(ARCH).so - endif - externals: codecs libs python visualizations screensavers +-libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so ++libs: cmyth libid3tag imagelib libexif system/libcpluff-@ARCH@.so + externals: codecs libs visualizations screensavers ---- xbmc-10/xbmc/FileSystem/HDHomeRun.h.orig 2010-09-14 01:00:12.000000000 -0400 -+++ xbmc-10/xbmc/FileSystem/HDHomeRun.h 2010-09-14 19:30:28.290178461 -0400 -@@ -22,7 +22,7 @@ + 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 "IDirectory.h" #include "DynamicDll.h" -#include "lib/libhdhomerun/hdhomerun.h" -+#include <hdhomerun/hdhomerun.h> - #include "FileSystem/IFile.h" ++#include <hdhomerun/hdhomerun.h> class DllHdHomeRunInterface -@@ -44,31 +44,57 @@ + { +@@ -42,30 +42,56 @@ class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface { @@ -122,15 +129,3 @@ + virtual void Unload() {} }; - namespace XFILE - ---- xbmc-10/configure.in.orig 2010-07-19 02:11:59.114393341 -0400 -+++ xbmc-10/configure.in 2010-07-19 02:12:07.951143138 -0400 -@@ -1348,7 +1348,6 @@ - xbmc/lib/libRTV/Makefile \ - xbmc/lib/libexif/Makefile \ - xbmc/lib/libXDAAP/Makefile \ -- xbmc/lib/libhdhomerun/Makefile \ - xbmc/lib/libhttpapi/Makefile \ - lib/jsoncpp/jsoncpp/src/lib_json/Makefile \ - xbmc/lib/libjsonrpc/Makefile \ diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index 3dd52bf..4bcaea1 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -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}" - @@ -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.1.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -21,11 +21,11 @@ Source1: xbmc-generate-tarball-xz.sh # 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 @@ Patch3: xbmc-10-disable-zlib-in-cximage.patch # 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: libtool 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,15 @@ BuildRequires: libmodplug-devel 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 +# 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,6 +160,19 @@ Requires: python-imaging 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, @@ -170,18 +185,18 @@ forecast functions, together third-party plugins. %patch1 -p0 %patch2 -p0 -%patch3 -p0 -%patch4 -p1 -%patch5 -p0 -%patch6 -p0 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +#patch3 -p0 +%patch4 -p0 +#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.*' \)) +#touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \ +#$(find xbmc/screensavers/rsxs-0.9 \( -name 'configure.*' -o -name 'Makefile.*' \)) %build @@ -192,14 +207,13 @@ chmod +x bootstrap # 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" \ @@ -210,7 +224,11 @@ LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \ ASFLAGS=-fPIC # disable the following: -# --enable-external-libraries +# +#--enable-external-python \ +#--enable-external-ffmpeg \ +#-disable-libdts --disable-liba52 \ + # enumerate all the external libraries because the libdts/liba52 detection # is broken upstream: http://trac.xbmc.org/ticket/9277 @@ -249,6 +267,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/*/*.png %changelog +* 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) |