7:37 a.m.
commit 0186c6a646c2b0babd591525826ba7fa32fb4c09
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Nov 23 01:30:31 2016 -0600
Revert "Update to 17.0 alpha 1"
This reverts commit 3c3e1e16657a91f97a722579dab7dff80bfa7327.
.gitignore | 2 +-
kodi-14.0-dvddemux-ffmpeg.patch | 13 ++++
kodi-16.0-dcadec.patch | 14 ++++
kodi-generate-tarball-xz.sh | 6 +-
kodi.spec | 34 ++++++----
sources | 2 +-
xbmc-13.0-dvdread.patch | 138 ++++++++++++++++++++++++++++++++++++++++
7 files changed, 193 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc6b14d..7c7ab45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kodi-17.0a1-patched.tar.xz
+/kodi-16.1-patched.tar.xz
diff --git a/kodi-14.0-dvddemux-ffmpeg.patch b/kodi-14.0-dvddemux-ffmpeg.patch
new file mode 100644
index 0000000..9e18b11
--- /dev/null
+++ b/kodi-14.0-dvddemux-ffmpeg.patch
@@ -0,0 +1,13 @@
+--- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2014-08-01
11:18:24.000000000 -0500
++++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-08-24 15:36:34.844966866
-0500
+@@ -542,10 +542,6 @@
+
+ void CDVDDemuxFFmpeg::Flush()
+ {
+- // naughty usage of an internal ffmpeg function
+- if (m_pFormatContext)
+- avformat_flush(m_pFormatContext);
+-
+ m_currentPts = DVD_NOPTS_VALUE;
+
+ m_pkt.result = -1;
diff --git a/kodi-16.0-dcadec.patch b/kodi-16.0-dcadec.patch
new file mode 100644
index 0000000..7bc79a6
--- /dev/null
+++ b/kodi-16.0-dcadec.patch
@@ -0,0 +1,14 @@
+diff -up ./configure.ac.orig ./configure.ac
+--- ./configure.ac.orig 2015-10-01 10:57:48.000000000 +0200
++++ ./configure.ac 2015-10-12 16:07:30.746406601 +0200
+@@ -1055,7 +1055,9 @@ AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h
+ AC_CHECK_HEADER([jpeglib.h],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([ogg/ogg.h],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
+-PKG_CHECK_MODULES([LIBDCADEC], [dcadec],, AC_MSG_ERROR([libdcadec not found]))
++if test "$with_ffmpeg" != "shared"; then
++ PKG_CHECK_MODULES([LIBDCADEC], [dcadec],, AC_MSG_ERROR([libdcadec not found]))
++fi
+
+ PKG_CHECK_MODULES([LIBCURL], [libcurl],, AC_MSG_ERROR([libcurl not found]))
+ XB_FIND_SONAME([CURL], [curl])
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 654dfbf..23c6d13 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,10 +1,10 @@
#!/bin/sh
-MAJORVERSION=17
-MINORVERSION=0a1
+MAJORVERSION=16
+MINORVERSION=1
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
-CODENAME=Krypton
+CODENAME=Jarvis
VERSION=${MAJORVERSION}.${MINORVERSION}${GITSHORT:+-${GITSHORT}}
diff --git a/kodi.spec b/kodi.spec
index 3cfdb7a..362c3f3 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,13 +1,13 @@
-%global PRERELEASE a1
+#global PRERELEASE rc1
%global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
-%global DIRVERSION %{version}%{PRERELEASE}
+#global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
Name: kodi
-Version: 17.0
-Release: 0.1%{?dist}
+Version: 16.1
+Release: 1%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -23,8 +23,19 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz
# ./kodi-generate-tarball-xz.sh
Source1: kodi-generate-tarball-xz.sh
+# filed ticket, but patch still needs work
+# http://trac.xbmc.org/ticket/9658
+Patch1: xbmc-13.0-dvdread.patch
+
# Set program version parameters
-Patch1: kodi-16.0-versioning.patch
+Patch2: kodi-16.0-versioning.patch
+
+# Remove call to internal ffmpeg function (misued anyway)
+Patch3: kodi-14.0-dvddemux-ffmpeg.patch
+
+# Disable dcadec library detection when using external ffmpeg (dcadec is only
+# needed to build bundled ffmpeg)
+Patch4: kodi-16.0-dcadec.patch
# Optional deps (not in EPEL)
%if 0%{?fedora}
@@ -164,7 +175,7 @@ BuildRequires: weston-devel
BuildRequires: yajl-devel
BuildRequires: zlib-devel
-Requires: dejavu-sans-fonts
+Requires: google-roboto-fonts
# need explicit requires for these packages
# as they are dynamically loaded via XBMC's arcane
# pseudo-DLL loading scheme (sigh)
@@ -235,6 +246,9 @@ library.
%prep
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1
+%patch2 -p1
+%patch3 -p0
+%patch4 -p0
%build
@@ -310,8 +324,9 @@ ln -s %{python_sitearch}/PIL
$RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module
#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
#ln -s %{python_sitearch}/pysqlite2
$RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
-# Use external font files instead of bundled ones
-ln -sf %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf
${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.estouchy/fonts/
+# Use external Roboto font files instead of bundled ones
+ln -sf %{_fontbasedir}/google-roboto/Roboto-Regular.ttf
${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.confluence/fonts/
+ln -sf %{_fontbasedir}/google-roboto/Roboto-Bold.ttf
${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.confluence/fonts/
# Move man-pages into system dir
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/
@@ -392,9 +407,6 @@ fi
%changelog
-* Wed Jun 22 2016 Michael Cronenworth <mike(a)cchtml.com> - 17.0-0.1
-- Kodi 17.0 alpha 1
-
* Mon Apr 25 2016 Michael Cronenworth <mike(a)cchtml.com> - 16.1-1
- Kodi 16.1 final
diff --git a/sources b/sources
index 97d3a6e..8346cbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e3f8686fab57f169a50004341167cf7 kodi-17.0a1-patched.tar.xz
+4f04f8d695bec409c5e39d5cd542d081 kodi-16.1-patched.tar.xz
diff --git a/xbmc-13.0-dvdread.patch b/xbmc-13.0-dvdread.patch
new file mode 100644
index 0000000..4e681da
--- /dev/null
+++ b/xbmc-13.0-dvdread.patch
@@ -0,0 +1,138 @@
+From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
+Date: Mon, 6 May 2013 17:07:40 -0600
+Subject: [PATCH 1/3] Fedora: use external dvdread
+
+Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
+(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
+---
+ bootstrap.mk | 5 -----
+ configure.in | 19 -------------------
+ lib/libdvd/Makefile.in | 20 +++++++-------------
+ 3 files changed, 7 insertions(+), 37 deletions(-)
+
+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 $((a)D)/autom4te.cache
+diff --git a/configure.ac b/configure.ac
+index beb8aac..343292e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2860,27 +2860,9 @@
+ --with-pic
+ ], [$SKIP_CONFIG_DVDCSS])
+
+-XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
+- ./configure2 \
+- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src
$DROID_DVDLIB_SEEK64" \
+- --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" &&
+- mkdir -p `pwd`/../includes/dvdread
+- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
+- cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
+-], [0])
+-
+ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
+ ./configure2 \
+ --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes
$DROID_DVDLIB_SEEK64" \
+- --extra-ldflags="-L`pwd`/../libdvdread/obj" \
+ --with-dvdread-config="`pwd`/../dvdread-config" \
+ --prefix="${prefix}" --includedir="${includedir}"
--libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+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
+
+ WRAPPER=@abs_top_srcdir(a)/xbmc/cores/DllLoader/exports/wrapper.o
+ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
+@@ -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
+-LDFLAGS += -shared -fPIC -rdynamic
++LDFLAGS += -shared -fPIC -rdynamic -ldvdread
+ endif
+
+ ifeq ($(ARCH), powerpc-osx)
+@@ -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)
+
+-$(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 +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 \
+ -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 $@
+--
+1.8.5.3
+