diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | xbmc-10-disable-zlib-in-cximage.patch | 17 | ||||
-rw-r--r-- | xbmc-12.0-fix-crash-on-player-stop.patch | 31 | ||||
-rw-r--r-- | xbmc-12.0-fix-pa-buffer-overruns.patch | 33 | ||||
-rw-r--r-- | xbmc-12.2-dvdread.patch (renamed from xbmc-12.0-dvdread.patch) | 80 | ||||
-rw-r--r-- | xbmc-12.2-hdhomerun.patch (renamed from xbmc-12.0-hdhomerun.patch) | 14 | ||||
-rwxr-xr-x | xbmc-generate-tarball-xz.sh | 2 | ||||
-rw-r--r-- | xbmc.spec | 29 |
8 files changed, 89 insertions, 119 deletions
@@ -8,4 +8,4 @@ /xbmc-12.0-Frodo_alpha6-patched.tar.xz /xbmc-12.0-Frodo_alpha7-patched.tar.xz /xbmc-pvr-addons-590f862-patched.tar.xz -/xbmc-12.1-patched.tar.xz +/xbmc-12.2-patched.tar.xz diff --git a/xbmc-10-disable-zlib-in-cximage.patch b/xbmc-10-disable-zlib-in-cximage.patch deleted file mode 100644 index 4ae8e76..0000000 --- a/xbmc-10-disable-zlib-in-cximage.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.in.orig 2010-08-20 00:17:55.000000000 -0400 -+++ configure.in 2010-08-20 00:19:27.621394427 -0400 -@@ -1736,14 +1736,6 @@ - fi - ], [$HOST_NOT_APPLE]) - --XB_CONFIG_MODULE([xbmc/lib/cximage-6.0/zlib], [ -- if test "$host_vendor" = "apple" ; then -- export MACOSX_DEPLOYMENT_TARGET=10.4 -- CFLAGS="$CFLAGS -fno-common" \ -- ./configure -- fi --], [0]) -- - XB_CONFIG_MODULE([lib/libass], [ - if test "$host_vendor" = "apple" ; then - CFLAGS="$CFLAGS -fno-common" \ diff --git a/xbmc-12.0-fix-crash-on-player-stop.patch b/xbmc-12.0-fix-crash-on-player-stop.patch deleted file mode 100644 index ce23bee..0000000 --- a/xbmc-12.0-fix-crash-on-player-stop.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3a4683508dbd23a6e97f301e05a99d7004d75002 Mon Sep 17 00:00:00 2001 -From: Michael Cronenworth <mike@cchtml.com> -Date: Thu, 14 Feb 2013 21:26:23 -0600 -Subject: [PATCH 1/2] AE: Pulse Audio fix crash on player stop. - -PA is calling back functions on stream destruction and may try -to read a free'd stream variable. (trac bug 13903) - -Signed-off-by: Michael Cronenworth <mike@cchtml.com> ---- - xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp b/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp -index 2322b47..f80d4d8 100644 ---- a/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp -+++ b/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp -@@ -252,6 +252,10 @@ void CPulseAEStream::Destroy() - - if (m_Stream) - { -+ pa_stream_set_state_callback(m_Stream, NULL, NULL); -+ pa_stream_set_write_callback(m_Stream, NULL, NULL); -+ pa_stream_set_latency_update_callback(m_Stream, NULL, NULL); -+ pa_stream_set_underflow_callback(m_Stream, NULL, NULL); - pa_stream_disconnect(m_Stream); - pa_stream_unref(m_Stream); - m_Stream = NULL; --- -1.7.11.7 - diff --git a/xbmc-12.0-fix-pa-buffer-overruns.patch b/xbmc-12.0-fix-pa-buffer-overruns.patch deleted file mode 100644 index 7f5227d..0000000 --- a/xbmc-12.0-fix-pa-buffer-overruns.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5820b25e2fb7ce89ccc2e26e58c9b4fc86a7af21 Mon Sep 17 00:00:00 2001 -From: Michael Cronenworth <mike@cchtml.com> -Date: Thu, 14 Feb 2013 22:45:26 -0600 -Subject: [PATCH 2/2] AE: Pulse Audio fix buffer underruns. - -The cache buffer size was being initialized to the write size -of a PA stream, which is not the buffer size of the PA server. -The cache buffer size will now use the PA server buffer size. -(trac bug 13902) - -Signed-off-by: Michael Cronenworth <mike@cchtml.com> ---- - xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp b/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp -index f80d4d8..c3c34f2 100644 ---- a/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp -+++ b/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp -@@ -203,7 +203,9 @@ CPulseAEStream::CPulseAEStream(pa_context *context, pa_threaded_mainloop *mainLo - return /*false*/; - } - -- m_cacheSize = pa_stream_writable_size(m_Stream); -+ const pa_buffer_attr *streamBuffer; -+ streamBuffer = pa_stream_get_buffer_attr(m_Stream); -+ m_cacheSize = streamBuffer->maxlength; - - pa_threaded_mainloop_unlock(m_MainLoop); - --- -1.7.11.7 - diff --git a/xbmc-12.0-dvdread.patch b/xbmc-12.2-dvdread.patch index 0c819d0..f798043 100644 --- a/xbmc-12.0-dvdread.patch +++ b/xbmc-12.2-dvdread.patch @@ -1,6 +1,39 @@ ---- 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 @@ +commit 9f9845af842a376d5bdf70742785e7727695fd03 +Author: Ken Dreyer <ktdreyer@ktdreyer.com> +Date: Mon May 6 17:07:40 2013 -0600 + + Fedora: use external dvdread + + Original patch by Alex Lancaster <alexlan[AT]fedoraproject org> + +diff --git a/bootstrap.mk b/bootstrap.mk +index 8bc4795..1fc31a4 100644 +--- a/bootstrap.mk ++++ b/bootstrap.mk +@@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),) + BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac + DVD_CSS=lib/libdvd/libdvdcss/configure + endif +-BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac + BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac + + ifneq ($(wildcard pvr-addons/Makefile.am),) +@@ -18,10 +17,6 @@ endif + BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS)) + all: $(BOOTSTRAP_TARGETS) + +-#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav. +-lib/libdvd/libdvdread/configure: $(DVD_CSS) +-lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure +- + %: %.ac + autoreconf -vif $(@D) + -@rm -rf $(@D)/autom4te.cache +diff --git a/configure.in b/configure.in +index e98cc95..e922043 100644 +--- a/configure.in ++++ b/configure.in +@@ -2616,28 +2616,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ --with-pic ], [$SKIP_CONFIG_DVDCSS]) @@ -26,23 +59,25 @@ - --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" \ ++ --extra-cflags="$CFLAGS -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 @@ +diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in +index 69d2286..1f5eebb 100644 +--- a/lib/libdvd/Makefile.in ++++ b/lib/libdvd/Makefile.in +@@ -5,8 +5,7 @@ CXX=@CXX@ SYSDIR=@abs_top_srcdir@/system/players/dvdplayer SOS= libdvdnav-$(ARCH).so -DIRS= libdvdread \ - libdvdnav -+DIRS= 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 @@ +@@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al ifeq ($(findstring osx,$(ARCH)),osx) LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress else @@ -51,7 +86,17 @@ endif ifeq ($(ARCH), powerpc-osx) -@@ -48,9 +47,9 @@ +@@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS)) + + DISTCLEAN_FILES=includes/dvdread/*.h \ + includes/dvdcss/*.h \ +- libdvdnav/config.h \ +- libdvdread/config.h ++ libdvdnav/config.h + + .PHONY: $(DIRS) compile + +@@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ $(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O) @@ -63,14 +108,25 @@ else -@@ -59,8 +58,8 @@ +@@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \ `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 -lm \ +$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \ ++ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \ -Wl,--unresolved-symbols=ignore-all \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) +@@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss; + libdvdcss: compile + $(MAKE) -C $@ + +-libdvdread/obj/libdvdread.a: libdvdread; +-libdvdread: compile +- $(MAKE) -C $@ +- + libdvdnav/obj/libdvdnav.a: libdvdnav; + libdvdnav: compile + $(MAKE) -C $@ diff --git a/xbmc-12.0-hdhomerun.patch b/xbmc-12.2-hdhomerun.patch index 32fccfa..73cad40 100644 --- a/xbmc-12.0-hdhomerun.patch +++ b/xbmc-12.2-hdhomerun.patch @@ -1,13 +1,13 @@ -commit c6db60512b4ed9d9252a9234935b23fb1b970080 +commit ef5c269992b32d67de7547e9f530b6c971381f45 Author: Ken Dreyer <ktdreyer@ktdreyer.com> Date: Fri Aug 24 19:34:47 2012 -0600 - Fedora: use internal hdhomerun + Fedora: use external hdhomerun Original patch by Alex Lancaster <alexlan[AT]fedoraproject org> diff --git a/Makefile.in b/Makefile.in -index 31826b1..20eb86d 100644 +index 39dc6f9..79877b4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -179,7 +179,6 @@ endif @@ -18,7 +18,7 @@ index 31826b1..20eb86d 100644 lib/cpluff \ lib/xbmc-dll-symbols -@@ -356,8 +355,6 @@ libexif: dllloader +@@ -352,8 +351,6 @@ libexif: dllloader $(MAKE) -C lib/libexif cmyth: dllloader $(MAKE) -C lib/cmyth @@ -27,7 +27,7 @@ index 31826b1..20eb86d 100644 papcodecs: dllloader dvdpcodecs test -d system/players/paplayer || mkdir system/players/paplayer $(MAKE) -C lib/xbadpcm -@@ -386,7 +383,7 @@ endif +@@ -382,7 +379,7 @@ endif codecs: papcodecs dvdpcodecs @@ -37,10 +37,10 @@ index 31826b1..20eb86d 100644 externals: codecs libs visualizations screensavers libaddon pvraddons diff --git a/configure.in b/configure.in -index ce40a5b..18df99c 100644 +index e922043..b61f0dd 100644 --- a/configure.in +++ b/configure.in -@@ -2361,7 +2361,6 @@ OUTPUT_FILES="Makefile \ +@@ -2331,7 +2331,6 @@ OUTPUT_FILES="Makefile \ lib/libexif/Makefile \ lib/libXDAAP/Makefile \ lib/cmyth/Makefile \ diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh index 7b18f89..60fff3e 100755 --- a/xbmc-generate-tarball-xz.sh +++ b/xbmc-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=12 -MINORVERSION=1 +MINORVERSION=2 #PRERELEASE=Frodo_rc3 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} @@ -4,8 +4,8 @@ #global DIRVERSION %{version}-%{PRERELEASE} Name: xbmc -Version: 12.1 -Release: 2%{?dist} +Version: 12.2 +Release: 1%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -31,22 +31,12 @@ Patch1: xbmc-12.0-pvraddons-with-dependencies.patch # filed ticket, but patch still needs work # http://trac.xbmc.org/ticket/9658 -Patch2: xbmc-12.0-dvdread.patch - -# and new problem with zlib in cximage -# trac ticket filed: http://trac.xbmc.org/ticket/9659 -# but patch not attached because it needs work -Patch3: xbmc-10-disable-zlib-in-cximage.patch +Patch2: xbmc-12.2-dvdread.patch # need to file trac ticket, this patch just forces external hdhomerun # functionality, needs to be able fallback internal version -Patch4: xbmc-12.0-hdhomerun.patch +Patch3: xbmc-12.2-hdhomerun.patch -# Add better support for PA. -# These patches are upstream in https://github.com/xbmc/xbmc/pull/2240, but -# they are not in the Frodo (12.x) branch. -Patch5: xbmc-12.0-fix-crash-on-player-stop.patch -Patch6: xbmc-12.0-fix-pa-buffer-overruns.patch # Optional deps (not in EPEL) # (libbluray in EPEL 6 is too old.) @@ -230,9 +220,8 @@ forecast functions, together third-party plugins. %setup -q -a 2 -n %{name}-%{DIRVERSION} %patch1 -p1 -%patch2 -p0 -#patch3 -p0 -%patch4 -p1 +%patch2 -p1 +%patch3 -p1 %if 0%{?_with_hdhomerun} %else @@ -338,6 +327,12 @@ fi #%%{_includedir}/xbmc/xbmcclient.h %changelog +* Mon May 06 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.2-1 +- Update to Frodo 12.2 +- Rebase hdhomerun and dvdread patches onto 12.2 +- Drop upstreamed PA patches +- Drop unused cximage zlib patch + * Thu Apr 25 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.1-2 - Add patches for PA (https://github.com/xbmc/xbmc/pull/2240). Fixes #2655 |