From 07a4d38162f2718884c4d9462d169b1b7ab0b7c5 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Fri, 14 Mar 2014 10:18:41 -0600 Subject: Update to Gotham beta 1 - Update Goom/MySQL patch, per RHBZ #1069079 --- .gitignore | 2 +- xbmc-13.0-dvdread.patch | 16 +++++++--------- xbmc-13.0-hdhomerun.patch | 14 +++++++------- xbmc-13.0-libmysqlclient.patch | 27 +++++++++++++++++++-------- xbmc-generate-tarball-xz.sh | 2 +- xbmc.spec | 25 ++++++++++++++++++------- 6 files changed, 53 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index a492faa..37eaf36 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ /CVS /Makefile /sources -/xbmc-13.0-Gotham_alpha11-patched.tar.xz +/xbmc-13.0-Gotham-beta1-patched.tar.xz diff --git a/xbmc-13.0-dvdread.patch b/xbmc-13.0-dvdread.patch index 4a87b6d..27097ac 100644 --- a/xbmc-13.0-dvdread.patch +++ b/xbmc-13.0-dvdread.patch @@ -1,4 +1,4 @@ -From d04be10106d05c87a81cb1d886703bed1963a3d7 Mon Sep 17 00:00:00 2001 +From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Mon, 6 May 2013 17:07:40 -0600 Subject: [PATCH 1/3] Fedora: use external dvdread @@ -7,9 +7,9 @@ Original patch by Alex Lancaster (cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03) --- bootstrap.mk | 5 ----- - configure.in | 22 +--------------------- + configure.in | 19 ------------------- lib/libdvd/Makefile.in | 20 +++++++------------- - 3 files changed, 8 insertions(+), 39 deletions(-) + 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/bootstrap.mk b/bootstrap.mk index 8bc4795..1fc31a4 100644 @@ -35,10 +35,10 @@ index 8bc4795..1fc31a4 100644 autoreconf -vif $(@D) -@rm -rf $(@D)/autom4te.cache diff --git a/configure.in b/configure.in -index f277cac..433c4a2 100644 +index beb8aac..343292e 100644 --- a/configure.in +++ b/configure.in -@@ -2842,29 +2842,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ +@@ -2861,28 +2861,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ --with-pic ], [$SKIP_CONFIG_DVDCSS]) @@ -54,7 +54,6 @@ index f277cac..433c4a2 100644 - --disable-strip \ - --disable-opts \ - --cc="$CC" && -- $MAKE dvdread-config && - mkdir -p `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread @@ -62,10 +61,9 @@ index f277cac..433c4a2 100644 - XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ ./configure2 \ -- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \ + --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \ - --extra-ldflags="-L`pwd`/../libdvdread/obj" \ -- --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ -+ --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC" \ +- --with-dvdread-config="`pwd`/../dvdread-config" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ diff --git a/xbmc-13.0-hdhomerun.patch b/xbmc-13.0-hdhomerun.patch index a762d0d..434c8f7 100644 --- a/xbmc-13.0-hdhomerun.patch +++ b/xbmc-13.0-hdhomerun.patch @@ -1,4 +1,4 @@ -From 3de14b3f561594c326c96dbbe853d516fa8c242e Mon Sep 17 00:00:00 2001 +From 6c05d16be3bae96479363c2117c28c4261374ab4 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Fri, 24 Aug 2012 19:34:47 -0600 Subject: [PATCH 2/3] Fedora: use external hdhomerun @@ -12,10 +12,10 @@ Original patch by Alex Lancaster 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 76936d4..0f9bc0c 100644 +index 8eda3c4..fbb19bd 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -211,7 +211,6 @@ endif +@@ -208,7 +208,6 @@ endif LIB_DIRS=\ lib/cximage-6.0 \ lib/libexif \ @@ -23,7 +23,7 @@ index 76936d4..0f9bc0c 100644 lib/cpluff \ lib/xbmc-dll-symbols -@@ -428,8 +427,6 @@ libexif: dllloader +@@ -416,8 +415,6 @@ libexif: dllloader $(MAKE) -C lib/libexif cmyth: dllloader $(MAKE) -C lib/cmyth @@ -32,7 +32,7 @@ index 76936d4..0f9bc0c 100644 papcodecs: dllloader dvdpcodecs test -d system/players/paplayer || mkdir system/players/paplayer $(MAKE) -C lib/xbadpcm -@@ -458,7 +455,7 @@ endif +@@ -446,7 +443,7 @@ endif codecs: papcodecs dvdpcodecs dvdpextcodecs @@ -42,10 +42,10 @@ index 76936d4..0f9bc0c 100644 externals: codecs libs visualizations screensavers libaddon pvraddons diff --git a/configure.in b/configure.in -index 433c4a2..24a5e89 100644 +index 343292e..2060e24 100644 --- a/configure.in +++ b/configure.in -@@ -2528,7 +2528,6 @@ OUTPUT_FILES="Makefile \ +@@ -2544,7 +2544,6 @@ OUTPUT_FILES="Makefile \ lib/libexif/Makefile \ lib/libXDAAP/Makefile \ lib/cmyth/Makefile \ diff --git a/xbmc-13.0-libmysqlclient.patch b/xbmc-13.0-libmysqlclient.patch index 7a26922..cbadc45 100644 --- a/xbmc-13.0-libmysqlclient.patch +++ b/xbmc-13.0-libmysqlclient.patch @@ -1,19 +1,22 @@ -From 7f3906cd055135adc0930f5a9bb341b4be5a0675 Mon Sep 17 00:00:00 2001 +From 72331ff10f1815cb0c1b64dd15a16aa9b14b1559 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Sat, 22 Feb 2014 13:46:01 -0700 -Subject: [PATCH 3/3] Fedora: avoid linking libmysqlclient during Goom +Subject: [PATCH 3/3] Fedora: selectively avoid linking libmysqlclient -If libmysqlclient and libgnutls are linked to the same binary, we get a -segfault. +If libmysqlclient and libtspi are linked to the same binary, we get a +segfault. In XBMC, libavfilter pulls in libgnutls, which pulls in +libtspi. + +See https://bugzilla.redhat.com/1069079 --- - configure.in | 1 + - 1 file changed, 1 insertion(+) + configure.in | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/configure.in b/configure.in -index 24a5e89..4535204 100644 +index 2060e24..2a20339 100644 --- a/configure.in +++ b/configure.in -@@ -2879,6 +2879,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ +@@ -2898,6 +2898,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ ./configure \ CFLAGS="$CFLAGS" \ CXXFLAGS="$CXXFLAGS" \ @@ -21,6 +24,14 @@ index 24a5e89..4535204 100644 --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ +@@ -2924,6 +2925,7 @@ XB_CONFIG_MODULE([xbmc/screensavers/rsxs-0.9/], [ + CXX="$CXX" \ + CFLAGS="$TEMPCFLAGS" \ + CXXFLAGS="$CXXFLAGS" \ ++ LIBS="$(echo $LIBS | sed -e s/-lmysqlclient//g)" \ + `if test "$host_vendor" = "apple"; then echo --with-png=${prefix} --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib; fi` \ + --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ + --host=$host_alias \ -- 1.8.5.3 diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index 0da18c4..dedefe0 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -2,7 +2,7 @@ MAJORVERSION=13 MINORVERSION=0 -PRERELEASE=Gotham_alpha11 +PRERELEASE=Gotham-beta1 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} diff --git a/xbmc.spec b/xbmc.spec index 24078ea..4daa1ce 100644 --- a/xbmc.spec +++ b/xbmc.spec @@ -1,4 +1,4 @@ -%global PRERELEASE Gotham_alpha11 +%global PRERELEASE Gotham-beta1 #%%global DIRVERSION %{version} # use the line below for pre-releases %global DIRVERSION %{version}-%{PRERELEASE} @@ -10,7 +10,7 @@ Name: xbmc Version: 13.0 -Release: 0.4.Gotham_alpha11%{?dist} +Release: 0.5.Gotham_beta1%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -30,6 +30,7 @@ Patch1: xbmc-13.0-dvdread.patch Patch2: xbmc-13.0-hdhomerun.patch # Avoid segfault during goom's configure +# https://bugzilla.redhat.com/1069079 Patch3: xbmc-13.0-libmysqlclient.patch # Optional deps (not in EPEL) @@ -160,6 +161,7 @@ BuildRequires: libcec-devel %endif BuildRequires: libxml-devel BuildRequires: libxslt-devel +BuildRequires: trousers-devel # nfs-utils-lib-devel package currently broken #BuildRequires: nfs-utils-lib-devel @@ -254,6 +256,14 @@ chmod +x bootstrap # Can't use export nor %%configure (implies using export), because # the Makefile pile up *FLAGS in this case. +# TODO: we need to figure out a way to set these flags dynamically so that the +# "with external_ffmpeg" conditional is effective. +#%%if %{with external_ffmpeg} +#CPPFLAGS="-I/usr/include/ffmpeg" \ +#CFLAGS="$CFLAGS -I/usr/include/ffmpeg" \ +#CXXFLAGS="$CXXFLAGS -I/usr/include/ffmpeg" \ +#%%endif + ./configure \ --prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \ --libdir=%{_libdir} --datadir=%{_datadir} \ @@ -273,11 +283,8 @@ chmod +x bootstrap %endif --disable-dvdcss \ --disable-optimizations --disable-debug \ -%if %{with external_ffmpeg} -CPPFLAGS="-I/usr/include/ffmpeg" \ -%endif -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" \ +CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \ +CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \ LDFLAGS="-fPIC" \ LIBS="%{?_with_hdhomerun:-lhdhomerun} $LIBS" \ ASFLAGS=-fPIC @@ -349,6 +356,10 @@ fi #%%{_includedir}/xbmc/xbmcclient.h %changelog +* Fri Mar 14 2014 Ken Dreyer - 13.0-0.5.Gotham_beta1 +- Update to Gotham beta 1 +- Update Goom/MySQL patch, per RHBZ #1069079 + * Fri Feb 21 2014 Ken Dreyer - 13.0-0.4.Gotham_alpha11 - use internal ffmpeg - switch to bcond conditionals -- cgit