rpms/xbmc/F-18 xbmc-12.0-pvraddons-with-dependencies.patch, NONE, 1.1 xbmc-pvr-addons-generate-tarball-xz.sh, NONE, 1.1 sources, 1.17, 1.18 xbmc-12.0-hdhomerun.patch, 1.1, 1.2 xbmc-generate-tarball-xz.sh, 1.15, 1.16 xbmc.spec, 1.53, 1.54

Ken Dreyer ktdreyer at rpmfusion.org
Thu Dec 13 20:29:50 CET 2012 

Author: ktdreyer

Update of /cvs/free/rpms/xbmc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14583

Modified Files:
	sources xbmc-12.0-hdhomerun.patch xbmc-generate-tarball-xz.sh 
	xbmc.spec 
Added Files:
	xbmc-12.0-pvraddons-with-dependencies.patch 
	xbmc-pvr-addons-generate-tarball-xz.sh 
Log Message:
* Thu Dec 13 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-0.4.Frodo_rc1
- Disable crystalhd on non-x86 (by kwizart)
- Enable VAAPI: add BR: libva-devel (#2613)
- Add libcap BR (allows binding on privileged ports)
- Add patch to build pvraddons-with-dependencies


xbmc-12.0-pvraddons-with-dependencies.patch:
 configure.in |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE xbmc-12.0-pvraddons-with-dependencies.patch ---
>From 3eb985a5b256958370d8d5cb4864e31a0458b05f Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex at a1.net>
Date: Sun, 4 Nov 2012 14:05:52 +0100
Subject: [PATCH] configure: add --enable-pvraddons-with-dependencies switch
 for intree building of PVR Addons

---
 configure.in |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/configure.in b/configure.in
index 7889dde..fd6cea0 100644
--- a/configure.in
+++ b/configure.in
@@ -521,6 +521,14 @@ AC_ARG_ENABLE([external-ffmpeg],
   [use_external_ffmpeg=$use_external_libraries])
 
 ### End of external library options
+### PVR addons specific
+AC_ARG_ENABLE([pvraddons-with-dependencies],
+  [AS_HELP_STRING([--enable-pvraddons-with-dependencies],
+  [enable build of pvr addons with dependencies (default is no) 'Linux only'])],
+  [use_pvraddons_with_deps=$enableval],
+  [use_pvraddons_with_deps=no])
+
+### End PVR addons specific
 
 if test "x$host_vendor" != "xapple"; then
   DEFAULT_COMPILE_FLAGS="-fPIC -DPIC -D_REENTRANT"
@@ -2764,12 +2772,16 @@ XB_CONFIG_MODULE([pvr-addons], [
    if test "$USE_EXTERNAL_FFMPEG" = 1; then
       PVR_EXT_FFMPEG="--enable-external-ffmpeg"
    fi
+   if test "$use_pvraddons_with_deps" = "yes"; then
+      ADDONS_WITH_DEPS="--enable-addons-with-dependencies"
+   fi
   ./configure \
     --prefix="${prefix}" \
     --host=$host_alias \
     --build=$build_alias \
     --target=$target_alias \
     $PVR_EXT_FFMPEG \
+    $ADDONS_WITH_DEPS \
     CC="$CC" \
     CXX="$CXX" \
     CFLAGS="$CFLAGS" \
-- 
1.7.10



--- NEW FILE xbmc-pvr-addons-generate-tarball-xz.sh ---
#!/bin/sh

set -e

# The xbmc-pvr-addon software does not yet use version numbers, so we'll
# just use git hashes for identifiers.

GITHASH=1e666ced21
GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip

# download zipball
if [[ ! -f xbmc-pvr-addons-$GITHASH.zip ]]; then
    curl -o xbmc-pvr-addons-$GITHASH.zip -L $GITHUBURL
fi

# extract zipball
find . -maxdepth 1 -name "xbmc-pvr-addons-$GITHASH*" -type d -exec rm -r '{}' \;
unzip xbmc-pvr-addons-$GITHASH.zip

# Shorten GitHub's auto-generated top-level directory.
if [[ -d pvr-addons ]]; then
       rm -r pvr-addons
fi
find . -maxdepth 1 -name "xbmc-pvr-addons-$GITHASH*" -type d -exec mv '{}' pvr-addons \;

pushd pvr-addons

# remove Windows stuff
rm -r project

popd

# repack
tar -cJvf xbmc-pvr-addons-$GITHASH-patched.tar.xz pvr-addons

rm -r pvr-addons


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	11 Oct 2012 06:25:59 -0000	1.17
+++ sources	13 Dec 2012 19:29:49 -0000	1.18
@@ -1 +1,2 @@
-af5452648db87e2a1243cb9121f48229  xbmc-12.0-Frodo_alpha6-patched.tar.xz
+a6b90c12fde21b99ab0441ec404c62c0  xbmc-12.0-Frodo_rc1-patched.tar.xz
+a5162726bdffbbafc7884aff6ef44dd7  xbmc-pvr-addons-1e666ced21-patched.tar.xz

xbmc-12.0-hdhomerun.patch:
 Makefile.in                    |    5 --
 configure.in                   |    1 
 xbmc/filesystem/DllHDHomeRun.h |   78 +++++++++++++++++++++++++++--------------
 3 files changed, 53 insertions(+), 31 deletions(-)

Index: xbmc-12.0-hdhomerun.patch
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-12.0-hdhomerun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xbmc-12.0-hdhomerun.patch	11 Oct 2012 06:25:59 -0000	1.1
+++ xbmc-12.0-hdhomerun.patch	13 Dec 2012 19:29:49 -0000	1.2
@@ -1,4 +1,4 @@
-commit 896387e8d0f501b6f46336dd5928d1e71914486c
+commit c6db60512b4ed9d9252a9234935b23fb1b970080
 Author: Ken Dreyer <ktdreyer at ktdreyer.com>
 Date:   Fri Aug 24 19:34:47 2012 -0600
 
@@ -7,52 +7,52 @@
     Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
 
 diff --git a/Makefile.in b/Makefile.in
-index 6be215f..1120178 100755
+index 31826b1..20eb86d 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -141,7 +141,6 @@ endif
+@@ -179,7 +179,6 @@ endif
  LIB_DIRS=\
  	lib/cximage-6.0 \
  	lib/libexif \
 -	lib/libhdhomerun \
- 	lib/libid3tag \
- 	lib/libapetag \
  	lib/cpluff \
-@@ -295,8 +294,6 @@ libexif: dllloader
+ 	lib/xbmc-dll-symbols
+ 
+@@ -356,8 +355,6 @@ libexif: dllloader
  	$(MAKE) -C lib/libexif
  cmyth: dllloader
  	$(MAKE) -C lib/cmyth
 -libhdhomerun: dllloader
 -	$(MAKE) -C lib/libhdhomerun
- libid3tag: dllloader
- 	$(MAKE) -C lib/libid3tag
  papcodecs: dllloader dvdpcodecs
-@@ -322,7 +319,7 @@ imagelib: dllloader
+ 	test -d system/players/paplayer || mkdir system/players/paplayer
+ 	$(MAKE) -C lib/xbadpcm
+@@ -386,7 +383,7 @@ endif
  
  codecs: papcodecs dvdpcodecs
  
--libs: libhdhomerun libid3tag imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
-+libs: libid3tag imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
+-libs: libhdhomerun imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
++libs: imagelib libexif system/libcpluff- at ARCH@.so $(CMYTH)
  
  externals: codecs libs visualizations screensavers libaddon pvraddons
  
 diff --git a/configure.in b/configure.in
-index eabf052..948c9a9 100755
+index ce40a5b..18df99c 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2041,7 +2041,6 @@ OUTPUT_FILES="Makefile \
+@@ -2361,7 +2361,6 @@ OUTPUT_FILES="Makefile \
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
 -    lib/libhdhomerun/Makefile \
      lib/libsquish/Makefile \
-     lib/libid3tag/Makefile \
      lib/cximage-6.0/Makefile \
+     lib/addons/script.module.pil/Makefile \
 diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
-index 8d80cfe..a1134c5 100644
+index 1667fde..48bdae3 100644
 --- a/xbmc/filesystem/DllHDHomeRun.h
 +++ b/xbmc/filesystem/DllHDHomeRun.h
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@
   */
  
  #include "DynamicDll.h"
@@ -61,7 +61,7 @@
  
  class DllHdHomeRunInterface
  {
-@@ -42,30 +42,56 @@ public:
+@@ -41,30 +41,56 @@ public:
  
  class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
  {


Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xbmc-generate-tarball-xz.sh	11 Oct 2012 06:25:59 -0000	1.15
+++ xbmc-generate-tarball-xz.sh	13 Dec 2012 19:29:49 -0000	1.16
@@ -2,7 +2,7 @@
 
 MAJORVERSION=12
 MINORVERSION=0
-PRERELEASE=Frodo_alpha6
+PRERELEASE=Frodo_rc1
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
@@ -52,7 +52,7 @@
 # except for libass, cpluff, jsoncpp (need to figure out how to
 # remove these too)
 # xbmc-dll-symbols seems to be XBMC-specific
-for i in enca freetype liblame libmicrohttpd libmodplug libbluray librtmp win32
+for i in enca freetype libbluray liblame libmicrohttpd libmodplug librtmp win32
 do
     rm -r lib/$i
 done


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/xbmc.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xbmc.spec	24 Nov 2012 15:26:22 -0000	1.53
+++ xbmc.spec	13 Dec 2012 19:29:49 -0000	1.54
@@ -1,11 +1,11 @@
-%global PRERELEASE Frodo_alpha6
+%global PRERELEASE Frodo_rc1
 #global DIRVERSION %{version}
 # use the line below for pre-releases
 %global DIRVERSION %{version}-%{PRERELEASE}
 
 Name: xbmc
 Version: 12.0
-Release: 0.2.%{PRERELEASE}%{?dist}
+Release: 0.4.%{PRERELEASE}%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -19,9 +19,15 @@
 # where <version> is the particular version being used
 Source1: xbmc-generate-tarball-xz.sh
 
-# new patches for bootstrap
-# no trac ticket filed as yet
-Patch1: xbmc-12.0-bootstrap.patch
+# xbmc pvr addons are shipped as a separate git repo.
+Source2: xbmc-pvr-addons-1e666ced21-patched.tar.xz
+Source3: xbmc-pvr-addons-generate-tarball-xz.sh
+
+# https://github.com/xbmc/xbmc/pull/1725.patch
+# We need this as long as we build addons together with the main XBMC
+# software. (This will probably never get merged upstream; see pull
+# request for details.)
+Patch1: xbmc-12.0-pvraddons-with-dependencies.patch
 
 # filed ticket, but patch still needs work
 # http://trac.xbmc.org/ticket/9658
@@ -60,6 +66,7 @@
 %endif
 %{?fedora:%global _with_libbluray 1}
 %{?fedora:%global _with_cwiid     1}
+%{?fedora:%global _with_libssh    1}
 
 ExcludeArch: ppc64
 Buildroot: %{_tmppath}/%{name}-%{version}
@@ -78,7 +85,11 @@
 BuildRequires: libstdc++-devel
 BuildRequires: glib2-devel
 BuildRequires: libjasper-devel
+%if 0%{?el6}
 BuildRequires: libjpeg-devel
+%else
+BuildRequires: libjpeg-turbo-devel
+%endif
 BuildRequires: libogg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
@@ -162,12 +173,15 @@
 BuildRequires: swig
 BuildRequires: java-devel
 BuildRequires: lame-devel
+%if 0%{?_with_libssh}
+BuildRequires: libssh-devel
+%endif
+BuildRequires: libcap-devel
 
 # nfs-utils-lib-devel package currently broken
 #BuildRequires: nfs-utils-lib-devel
 BuildRequires: afpfs-ng-devel
-# VAAPI currently not working, comment-out
-#BuildRequires: libva-freeworld-devel
+BuildRequires: libva-devel
 
 # need explicit requires for these packages
 # as they are dynamically loaded via XBMC's arcane 
@@ -216,22 +230,23 @@
 
 %prep
 
-%setup -q -n %{name}-%{DIRVERSION}
+%setup -q -a 2 -n %{name}-%{DIRVERSION}
 
-%patch1 -p0
+%patch1 -p1
 %patch2 -p0
 #patch3 -p0
 %patch4 -p1
 #patch5 -p1
-#patch6 -p1
 
 %if 0%{?_with_hdhomerun}
 %else
   # Remove hdhomerun from the build.
   pushd xbmc/filesystem/
-    rm HDHomeRun.cpp HDHomeRun.h
-    sed -i Makefile.in -e '/HDHomeRun\.cpp/d'
-    sed -i FactoryDirectory.cpp -e '/HomeRun/d'
+    rm HDHomeRunFile.cpp HDHomeRunFile.h
+    rm HDHomeRunDirectory.cpp HDHomeRunDirectory.h
+    sed -i Makefile.in -e '/HDHomeRunFile\.cpp/d'
+    sed -i Makefile.in -e '/HDHomeRunDirectory\.cpp/d'
+    sed -i DirectoryFactory.cpp -e '/HomeRun/d'
     sed -i FileFactory.cpp -e '/HomeRun/d'
   popd
 %endif
@@ -250,6 +265,10 @@
 --enable-goom \
 --enable-external-libraries \
 --enable-pulse \
+--enable-pvraddons-with-dependencies \
+%if 0%{?_with_libssh} == 0
+--disable-ssh \
+%endif
 --disable-dvdcss \
 --disable-optimizations --disable-debug \
 CPPFLAGS="-I/usr/include/ffmpeg" \
@@ -323,8 +342,33 @@
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
-* Sat Nov 24 2012 Nicolas Chauvet <kwizart at gmail.com> - 12.0-0.2.Frodo_alpha6
-- Rebuilt for FFmpeg 1.0
+* Thu Dec 13 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-0.4.Frodo_rc1
+- Disable crystalhd on non-x86 (by kwizart)
+- Enable VAAPI: add BR: libva-devel (#2613)
+- Add libcap BR (allows binding on privileged ports)
+- Add patch to build pvraddons-with-dependencies
+
+* Wed Dec 12 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-0.3.Frodo_rc1
+- Update to Frodo RC 1
+
+* Wed Dec 05 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-0.3.Frodo_beta2
+- Update to Frodo beta 2
+- Drop patch for linking against pulse-simple
+- libjpeg is gone in Fedora. Conditionally build against libjpeg-turbo
+
+* Mon Nov 19 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-0.3.Frodo_alpha7
+- Rebase HDHomeRun removal to match upstream's file names
+- Conditionally disable libssh BR (unavailable in EL6)
+
+* Tue Nov 14 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-0.2.Frodo_alpha7
+- Add pvr addons
+
+* Tue Nov 13 2012 Ken Dreyer <ktdreyer at ktdreyer.com> - 12.0-0.1.Frodo_alpha7
+- Update to Frodo alpha 7
+- Drop bootstrap patch (system libdvdread works properly now)
+- Add upstream patch for linking against pulse-simple
+- Add BR for libssh
+- Rebase external hdhomerun patch onto alpha7
 
 * Thu Oct  4 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 12.0-0.1.Frodo_alpha6
 - Update to Frodo alpha 6

More information about the rpmfusion-commits mailing list