http://bugzilla.rpmfusion.org/show_bug.cgi?id=1030
--- Comment #48 from Rolf Fokkens <[email protected]> 2010-01-21 22:09:07 --- > OK, time to do a quick patch audit, Rolf and Ralf, could you clarify the > following points? Thanks. > Rolf: is this necessary, it seems to add a single "-I ../jpeg", I thought that > xbmc is using the system libjpeg at this point, should it be submitted > upstream? > Patch0: xbmc-9.11-a2-libjpeg.patch In another galaxy long ago (alpha2? Fedora11?) it had a purpose, but it's no nonger needed. > Rolf: has this been submitted upstream, will this be fixed in the 10.x > release? > Patch1: xbmc-9.11-a2-gcc440.patch Somehow we can no do without this one as well, on Fedora 12 anyhow. > This patch look for libdca, rather than libdts, there is already: > http://xbmc.org/trac/ticket/8040 (although patch slightly different to this > one) > Patch2: xbmc-9.11-b1-config.patch I renamed it to xbmc-9.11-libdca.patch. I tried the upstream patch, but it somehow makes make fail on "make -C libdts". > Rolf, is this necessary if we remove dvdcss from source? > Patch3: xbmc-9.11-b1-dvdlibs-external.patch Without this patch configure fails in an attempt to descend to xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss and xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread which no longer exist. > Rolf: could you clarify the purposes of the next 3 patches be submitted > upstream? Remlibs appears to force using external libass: > Patch8: xbmc-9.11-spyce.diff > Patch9: xbmc-9.11-RandomNumberGenerators.hpp.diff The purposes of the previous patches have been clarified by Ralf > Patch10: xbmc-9.11-remlibs.patch Without this patch config.status attempts to descend to open xbmc/lib/libass/xbmc/Makefile.in which is obsolete (and has been removed) as we use external libass now. I renamed it to xbmc-9.11-remlibass.patch, and removed an irrelevant part. I changed Source0 to be based on xz compression, it reduces the src.rpm size! Both src.rpm and nosrc.rpm can be found at: http://rolffokkens.dyndns.org/xbmc-9.11-9.fc12/ --- xbmc.spec.orig 2010-01-21 08:47:27.000000000 +0100 +++ xbmc.spec 2010-01-21 21:52:56.394548815 +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,16 +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 +Source1: xbmc-generate-tarball-xz.sh -Patch0: xbmc-9.11-a2-libjpeg.patch +#Patch0: xbmc-9.11-a2-libjpeg.patch # check if this is in SVN -Patch1: xbmc-9.11-a2-gcc440.patch +#Patch1: xbmc-9.11-a2-gcc440.patch # 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 +# http://xbmc.org/trac/ticket/8040 +Patch2: xbmc-9.11-libdca.patch # is this necessary if we remove dvdcss from source? Patch3: xbmc-9.11-b1-dvdlibs-external.patch @@ -38,7 +39,7 @@ # 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 +Patch10: xbmc-9.11-remlibass.patch # Fixes GCC warning: partial backport to 9.11 # (should be fixed in next release) @@ -128,9 +129,9 @@ %setup -q -n %{name}-%{version} -%patch0 -p1 -b .libjpeg -%patch1 -p1 -b .gcc440 -%patch2 -p1 -b .config +## %patch0 -p1 -b .libjpeg +## %patch1 -p1 -b .gcc440 +%patch2 -p1 -b .dtsdca %patch3 -p1 -b .dvdlibs %patch4 -p1 -b .cdio %patch5 -p0 -b .makefilein @@ -142,7 +143,6 @@ %patch11 -p1 -b .gccwarning %patch12 -p1 -b .goahead - %build CFLAGS="-fPIC -I/usr/include/ffmpeg/" CXXFLAGS="$CFLAGS" @@ -158,7 +158,7 @@ export ASFLAGS=-fPIC %configure --enable-external-libraries --enable-goom -make VERBOSE=1 +make %{?_smp_mflags} VERBOSE=1 %install rm -rf $RPM_BUILD_ROOT -- 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.
