[Bug 1030] Review request: xbmc - Media center

RPM Fusion Bugzilla noreply at rpmfusion.org
Fri Jan 22 09:09:31 CET 2010


http://bugzilla.rpmfusion.org/show_bug.cgi?id=1030





--- Comment #52 from Rolf Fokkens <rolf.fokkens at online.nl>  2010-01-22 09:09:30 ---
Alex, the following diff may be of help. I assume that several people are
working on the spec, so it makes no sense to provide a "latest and greatest" -
though I'll upload the latest spec as well. The following diff however may help
you to cut 'n' paste the spec you're maintaining.

[root at home07 SPECS]# diff -ruN ~rolf/rpmbuild/SPECS/xbmc.spec xbmc.spec
--- /home/rolf/rpmbuild/SPECS/xbmc.spec 2010-01-21 08:47:27.000000000 +0100
+++ xbmc.spec   2010-01-22 09:04:24.377603593 +0100
@@ -1,9 +1,10 @@
 Name: xbmc
 Version: 9.11
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.xbmc.org/

-Source0: %{name}-%{version}-patched.tar.gz
+Source0: %{name}-%{version}-patched.tar.xz
+NoSource:       0
 # xbmc contains code that we cannot ship, as well as redundant private
 # copies of upstream libraries that we already distribute.  Therefore
 # we use this script to remove the code before shipping it.
@@ -12,18 +13,16 @@
 # and invoke this script while in the directory where the tarball is located:
 # sh xbmc-generate-tarball.sh <version>
 # where <version> is the particular version being used
-Source1: xbmc-generate-tarball.sh
-
-Patch0:        xbmc-9.11-a2-libjpeg.patch
-
-# check if this is in SVN
-Patch1:        xbmc-9.11-a2-gcc440.patch
+Source1: xbmc-generate-tarball-xz.sh

 # look for libdca, rather than libdts
-# http://xbmc.org/trac/ticket/8040 (although patch slightly different to this
one)
-Patch2:        xbmc-9.11-b1-config.patch
-
-# is this necessary if we remove dvdcss from source?
+# http://xbmc.org/trac/ticket/8040 also has a patch, but that one doesn't 
+# compile well
+Patch2:        xbmc-9.11-libdca.patch
+
+# dvdread and dvdcss have been removed from source, but without this patch
+# configure fails in an attempt to enter the removed dirs of dvdread and
+# dvdcss
 Patch3:        xbmc-9.11-b1-dvdlibs-external.patch

 # http://xbmc.org/trac/ticket/8026 (this will be in next release)
@@ -38,7 +37,10 @@
 # check to see if the next 3 can be submitted upstream
 Patch8: xbmc-9.11-spyce.diff
 Patch9: xbmc-9.11-RandomNumberGenerators.hpp.diff
-Patch10: xbmc-9.11-remlibs.patch
+
+# we removed libass from source, and need the next patch to stop 
+# config.status opening libass/xbmc/Makefile.in
+Patch10: xbmc-9.11-remlibass.patch

 # Fixes GCC warning: partial backport to 9.11
 # (should be fixed in next release)
@@ -128,9 +130,7 @@

 %setup -q -n %{name}-%{version}

-%patch0 -p1 -b .libjpeg
-%patch1 -p1 -b .gcc440
-%patch2 -p1 -b .config
+%patch2 -p1 -b .dtsdca
 %patch3 -p1 -b .dvdlibs
 %patch4 -p1 -b .cdio
 %patch5 -p0 -b .makefilein
@@ -142,7 +142,6 @@
 %patch11 -p1 -b .gccwarning
 %patch12 -p1 -b .goahead

-
 %build
 CFLAGS="-fPIC -I/usr/include/ffmpeg/"
 CXXFLAGS="$CFLAGS"
@@ -158,7 +157,7 @@
 export ASFLAGS=-fPIC
 %configure --enable-external-libraries --enable-goom

-make VERBOSE=1
+make %{?_smp_mflags} VERBOSE=1

 %install
 rm -rf $RPM_BUILD_ROOT
@@ -185,6 +184,13 @@
 %{_datadir}/pixmaps/xbmc.png

 %changelog
+* Thu Jan 21 2010 Rolf Fokkens <rolf fokkens[AT]wanadoo nl> - 9.11-9
+- increase compression ratio of tarball by compressing with cx
+  the src.rpm is now about 20% smaller
+- remove patch0 and patch1, they are obsolete now
+- rename patch2 and patch10 to more meaningful name
+
+%changelog
 * Thu Jan 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-8
 - Update xbmc script patch (thanks Ralf C)
 - Reorder patches, add upstream tickets where possible


-- 
Configure bugmail: http://bugzilla.rpmfusion.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
You are the assignee for the bug.


More information about the rpmfusion-developers mailing list