rpms/openafs-kmod/F-18 openafs-kmod.spec, 1.27, 1.28 sources, 1.11, 1.12 openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch, 1.1, NONE openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch, 1.1, NONE openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch, 1.1, NONE openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch, 1.1, NONE openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch, 1.1, NONE openafs-1.6.1-0006-Linux-3.6-create-inod
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15622
Modified Files:
openafs-kmod.spec sources
Removed Files:
openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch
openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch
openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch
openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch
openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch
openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch
openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch
openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch
openafs-1.6.1-clear_inode.patch openafs-1.6.1-encode_fh.patch
Log Message:
* Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-0.pre1
- Update to OpenAFS 1.6.2 pre-release 1
- Remove upstreamed patches
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/openafs-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- openafs-kmod.spec 12 Dec 2012 10:53:26 -0000 1.27
+++ openafs-kmod.spec 13 Dec 2012 20:06:49 -0000 1.28
@@ -17,59 +17,22 @@
%define kmod_name openafs
+%define pre pre1
+
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.1
-Release: 4%{?dist}.3
+Version: 1.6.2
+Release: 0.%{pre}%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
License: IBM
URL: http://www.openafs.org
-Source0: http://dl.openafs.org/dl/%{version}/%{kmod_name}-%{version}-src.tar.bz2
+Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{kmod_name}-%{versio...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Upstream patches to build on kernel 3.5
-Patch0: openafs-1.6.1-clear_inode.patch
-Patch1: openafs-1.6.1-encode_fh.patch
-
-# Upstream patches to build on kernel 3.6. In-progress in Gerrit.
-# Steps to create these patches:
-# 1) git clone from openafs.org
-# 2) git checkout openafs-stable-1_6_1
-# 3) git checkout -b fedora
-# 4) Get the two Patches above (patch0 and patch1)
-# git cherry-pick -x cc63cbbc138f60d6b5964fa859dcd778717b24c2
-# git cherry-pick -x 407e7c90a97143d436ad3a6af6bbfa431c849191
-# 5) Take note of the commit hash here.
-# 6) Cherry-pick the appropriate patches from Gerrit onto this "fedora" branch
-# When cherry-picking "d_alias and i_dentry are now hlists"
-# (http://gerrit.openafs.org/8080), avoid the post-1.6.1 canonical_dentry()
-# function from http://gerrit.openafs.org/7951 .
-# 7) Create the patch files
-# git format-patch <hash in step 5>
-# If you forgot the hash from step 5, look with "git log --oneline"
-# 8) Rename patche files according to Fedora package guidelines:
-# for i in $(ls *.patch); do mv $i openafs-1.6.1-$i; done
-
-# http://gerrit.openafs.org/8077
-Patch4: openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch
-# http://gerrit.openafs.org/8078
-Patch5: openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch
-# http://gerrit.openafs.org/8079
-Patch6: openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch
-# http://gerrit.openafs.org/8080
-Patch7: openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch
-# http://gerrit.openafs.org/8081
-Patch8: openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch
-# http://gerrit.openafs.org/8082
-Patch9: openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch
-# http://gerrit.openafs.org/8083
-Patch10: openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch
-# http://gerrit.openafs.org/8084
-Patch11: openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
BuildRequires: %{AkmodsBuildRequires}
@@ -96,24 +59,12 @@
%setup -q -c -T -a 0
# apply patches and do other stuff here
-pushd %{kmod_name}-%{version}
-# Kernel 3.5 patches
-%patch0 -p1
-%patch1 -p1
-# Kernel 3.6 patches
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+pushd %{kmod_name}-%{version}%{pre}
./regen.sh
popd
for kernel_version in %{?kernel_versions} ; do
- cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
+ cp -a %{kmod_name}-%{version}%{pre} _kmod_build_${kernel_version%%___*}
done
@@ -147,14 +98,9 @@
%changelog
-* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.3
-- Rebuilt for current f18 kernel
-
-* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.2
-- Rebuilt for current f18 kernel
-
-* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-4.1
-- Rebuilt for Fedora 18 Beta kernel
+* Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-0.pre1
+- Update to OpenAFS 1.6.2 pre-release 1
+- Remove upstreamed patches
* Sat Oct 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-4
- Rebuild for F-18 Beta. Debugging is now disabled in F-18 kernels.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Apr 2012 18:40:59 -0000 1.11
+++ sources 13 Dec 2012 20:06:49 -0000 1.12
@@ -1 +1 @@
-7215609990a2b253f8980fc1e1da0530 openafs-1.6.1-src.tar.bz2
+5d77189a51e3b91783ac52eb0748e739 openafs-1.6.2pre1-src.tar.bz2
--- openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch DELETED ---
--- openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch DELETED ---
--- openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch DELETED ---
--- openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch DELETED ---
--- openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch DELETED ---
--- openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch DELETED ---
--- openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch DELETED ---
--- openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch DELETED ---
--- openafs-1.6.1-clear_inode.patch DELETED ---
--- openafs-1.6.1-encode_fh.patch DELETED ---
11 years, 11 months
rpms/xbmc/F-18 xbmc.spec,1.54,1.55
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/xbmc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14805
Modified Files:
xbmc.spec
Log Message:
* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 12.0-0.4.Frodo_rc1.f18.1
- Bumping release for bad tag in F18 (sigh)
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-18/xbmc.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xbmc.spec 13 Dec 2012 19:29:49 -0000 1.54
+++ xbmc.spec 13 Dec 2012 19:32:15 -0000 1.55
@@ -5,7 +5,7 @@
Name: xbmc
Version: 12.0
-Release: 0.4.%{PRERELEASE}%{?dist}
+Release: 0.4.%{PRERELEASE}%{?dist}.1
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -342,6 +342,9 @@
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 12.0-0.4.Frodo_rc1.f18.1
+- Bumping release for bad tag in F18 (sigh)
+
* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 12.0-0.4.Frodo_rc1
- Disable crystalhd on non-x86 (by kwizart)
- Enable VAAPI: add BR: libva-devel (#2613)
11 years, 11 months
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
by Ken Dreyer
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(a)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(a)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(a)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-@ARCH@.so $(CMYTH)
-+libs: libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
+-libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
++libs: imagelib libexif system/libcpluff-@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(a)gmail.com> - 12.0-0.2.Frodo_alpha6
-- Rebuilt for FFmpeg 1.0
+* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)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(a)ktdreyer.com> - 12.0-0.3.Frodo_rc1
+- Update to Frodo RC 1
+
+* Wed Dec 05 2012 Ken Dreyer <ktdreyer(a)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(a)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(a)ktdreyer.com> - 12.0-0.2.Frodo_alpha7
+- Add pvr addons
+
+* Tue Nov 13 2012 Ken Dreyer <ktdreyer(a)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
11 years, 11 months
rpms/openafs-kmod/devel .cvsignore, 1.9, 1.10 openafs-kmod.spec, 1.23, 1.24 sources, 1.11, 1.12 openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch, 1.1, NONE openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch, 1.1, NONE openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch, 1.1, NONE openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch, 1.1, NONE openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch, 1.1, NONE openafs-1.6.1-000
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13959
Modified Files:
.cvsignore openafs-kmod.spec sources
Removed Files:
openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch
openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch
openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch
openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch
openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch
openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch
openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch
openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch
openafs-1.6.1-clear_inode.patch openafs-1.6.1-encode_fh.patch
Log Message:
* Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-0.pre1
- Update to OpenAFS 1.6.2 pre-release 1
- Remove upstreamed patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 4 Apr 2012 18:40:59 -0000 1.9
+++ .cvsignore 13 Dec 2012 19:05:59 -0000 1.10
@@ -1 +1 @@
-openafs-1.6.1-src.tar.bz2
+openafs-1.6.2pre1-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- openafs-kmod.spec 6 Oct 2012 19:31:16 -0000 1.23
+++ openafs-kmod.spec 13 Dec 2012 19:06:00 -0000 1.24
@@ -17,59 +17,22 @@
%define kmod_name openafs
+%define pre pre1
+
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.1
-Release: 4%{?dist}
+Version: 1.6.2
+Release: 0.%{pre}%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
License: IBM
URL: http://www.openafs.org
-Source0: http://dl.openafs.org/dl/%{version}/%{kmod_name}-%{version}-src.tar.bz2
+Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{kmod_name}-%{versio...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Upstream patches to build on kernel 3.5
-Patch0: openafs-1.6.1-clear_inode.patch
-Patch1: openafs-1.6.1-encode_fh.patch
-
-# Upstream patches to build on kernel 3.6. In-progress in Gerrit.
-# Steps to create these patches:
-# 1) git clone from openafs.org
-# 2) git checkout openafs-stable-1_6_1
-# 3) git checkout -b fedora
-# 4) Get the two Patches above (patch0 and patch1)
-# git cherry-pick -x cc63cbbc138f60d6b5964fa859dcd778717b24c2
-# git cherry-pick -x 407e7c90a97143d436ad3a6af6bbfa431c849191
-# 5) Take note of the commit hash here.
-# 6) Cherry-pick the appropriate patches from Gerrit onto this "fedora" branch
-# When cherry-picking "d_alias and i_dentry are now hlists"
-# (http://gerrit.openafs.org/8080), avoid the post-1.6.1 canonical_dentry()
-# function from http://gerrit.openafs.org/7951 .
-# 7) Create the patch files
-# git format-patch <hash in step 5>
-# If you forgot the hash from step 5, look with "git log --oneline"
-# 8) Rename patche files according to Fedora package guidelines:
-# for i in $(ls *.patch); do mv $i openafs-1.6.1-$i; done
-
-# http://gerrit.openafs.org/8077
-Patch4: openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch
-# http://gerrit.openafs.org/8078
-Patch5: openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch
-# http://gerrit.openafs.org/8079
-Patch6: openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch
-# http://gerrit.openafs.org/8080
-Patch7: openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch
-# http://gerrit.openafs.org/8081
-Patch8: openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch
-# http://gerrit.openafs.org/8082
-Patch9: openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch
-# http://gerrit.openafs.org/8083
-Patch10: openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch
-# http://gerrit.openafs.org/8084
-Patch11: openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
BuildRequires: %{AkmodsBuildRequires}
@@ -96,24 +59,12 @@
%setup -q -c -T -a 0
# apply patches and do other stuff here
-pushd %{kmod_name}-%{version}
-# Kernel 3.5 patches
-%patch0 -p1
-%patch1 -p1
-# Kernel 3.6 patches
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+pushd %{kmod_name}-%{version}%{pre}
./regen.sh
popd
for kernel_version in %{?kernel_versions} ; do
- cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
+ cp -a %{kmod_name}-%{version}%{pre} _kmod_build_${kernel_version%%___*}
done
@@ -147,6 +98,10 @@
%changelog
+* Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-0.pre1
+- Update to OpenAFS 1.6.2 pre-release 1
+- Remove upstreamed patches
+
* Sat Oct 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-4
- Rebuild for F-18 Beta. Debugging is now disabled in F-18 kernels.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Apr 2012 18:40:59 -0000 1.11
+++ sources 13 Dec 2012 19:06:00 -0000 1.12
@@ -1 +1 @@
-7215609990a2b253f8980fc1e1da0530 openafs-1.6.1-src.tar.bz2
+5d77189a51e3b91783ac52eb0748e739 openafs-1.6.2pre1-src.tar.bz2
--- openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch DELETED ---
--- openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch DELETED ---
--- openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch DELETED ---
--- openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch DELETED ---
--- openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch DELETED ---
--- openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch DELETED ---
--- openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch DELETED ---
--- openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch DELETED ---
--- openafs-1.6.1-clear_inode.patch DELETED ---
--- openafs-1.6.1-encode_fh.patch DELETED ---
11 years, 11 months
rpms/openafs/devel .cvsignore, 1.8, 1.9 openafs.spec, 1.32, 1.33 sources, 1.11, 1.12 openafs-1.6.1-afsd-sys-resource-h.patch, 1.1, NONE openafs-1.6.1-int31-partsize.patch, 1.1, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13682
Modified Files:
.cvsignore openafs.spec sources
Removed Files:
openafs-1.6.1-afsd-sys-resource-h.patch
openafs-1.6.1-int31-partsize.patch
Log Message:
* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre1
- Update to OpenAFS 1.6.2 pre-release 1
- Remove upstreamed patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 4 Apr 2012 18:10:38 -0000 1.8
+++ .cvsignore 13 Dec 2012 18:56:05 -0000 1.9
@@ -1,2 +1,2 @@
-openafs-1.6.1-src.tar.bz2
-openafs-1.6.1-doc.tar.bz2
+openafs-1.6.2pre1-src.tar.bz2
+openafs-1.6.2pre1-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openafs.spec 12 Dec 2012 04:56:10 -0000 1.32
+++ openafs.spec 13 Dec 2012 18:56:06 -0000 1.33
@@ -10,15 +10,17 @@
%define sysname amd64_linux26
%endif
+%define pre pre1
+
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.1
-Release: 9%{?dist}
+Version: 1.6.2
+Release: 0.%{pre}%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
-Source0: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-src.tar.bz2
-Source1: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-doc.tar.bz2
+Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p...
+Source1: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p...
Source11: http://grand.central.org/dl/cellservdb/CellServDB
Source12: cacheinfo
Source13: openafs.init
@@ -36,22 +38,16 @@
BuildRequires: automake, autoconf
Patch0: openafs-1.6.0-fPIC.patch
-# Upstream patch to fix fileservers with >2TB partitions
-Patch1: openafs-1.6.1-int31-partsize.patch
-# Upstream patch to compile with newer glibc
-# (not yet on openafs-stable-1_6_x; cherry-picked from master)
-Patch2: openafs-1.6.1-afsd-sys-resource-h.patch
# systemd: Skip CellServDB manipulation
-Patch3: openafs-1.6.1-systemd-no-cellservdb.patch
+Patch1: openafs-1.6.1-systemd-no-cellservdb.patch
# systemd: unload the proper kernel module
-# (TODO: check if this can be upstreamed)
-Patch4: openafs-1.6.1-systemd-kmod-name.patch
+Patch2: openafs-1.6.1-systemd-kmod-name.patch
# systemd: use FHS-style paths instead of transarc paths
-Patch5: openafs-1.6.1-systemd-fhs.patch
+Patch3: openafs-1.6.1-systemd-fhs.patch
# systemd: add additional user-friendly environment vars
-Patch6: openafs-1.6.1-systemd-env-vars.patch
+Patch4: openafs-1.6.1-systemd-env-vars.patch
# Add ExecPostStart "sysnames" helper script.
-Patch7: openafs-1.6.1-systemd-execpoststart.patch
+Patch5: openafs-1.6.1-systemd-execpoststart.patch
# Use systemd unit files on Fedora 18 and above.
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -132,24 +128,17 @@
Cell.
%prep
-%setup -q -b 1 -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}%{pre}
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
-# This allows fileservers to report correct partition usage on
-# partitions greater than 2TB.
-%patch1 -p1
-
-# This allows us to build with newer glibc
-%patch2 -p1
-
# systemd unit file changes for RPM Fusion
-%patch3 -p1 -b .cellservdb
-%patch4 -p1 -b .kmod
-%patch5 -p1 -b .fhs
-%patch6 -p1 -b .envvars
-%patch7 -p1 -b .execpoststart
+%patch1 -p1 -b .cellservdb
+%patch2 -p1 -b .kmod
+%patch3 -p1 -b .fhs
+%patch4 -p1 -b .envvars
+%patch5 -p1 -b .execpoststart
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
@@ -465,6 +454,10 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre1
+- Update to OpenAFS 1.6.2 pre-release 1
+- Remove upstreamed patches
+
* Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-9
- Correct bosserver path in systemd unit file
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Apr 2012 18:10:38 -0000 1.11
+++ sources 13 Dec 2012 18:56:06 -0000 1.12
@@ -1,2 +1,2 @@
-7215609990a2b253f8980fc1e1da0530 openafs-1.6.1-src.tar.bz2
-73d9a86038e827f95de90cf56c940bf7 openafs-1.6.1-doc.tar.bz2
+5d77189a51e3b91783ac52eb0748e739 openafs-1.6.2pre1-src.tar.bz2
+e05267e5e0b67c86baf11b35860fc8ff openafs-1.6.2pre1-doc.tar.bz2
--- openafs-1.6.1-afsd-sys-resource-h.patch DELETED ---
--- openafs-1.6.1-int31-partsize.patch DELETED ---
11 years, 11 months
rpms/xbmc/devel xbmc-12.0-pvraddons-with-dependencies.patch, NONE, 1.1 xbmc.spec, 1.55, 1.56
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13345
Modified Files:
xbmc.spec
Added Files:
xbmc-12.0-pvraddons-with-dependencies.patch
Log Message:
* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)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(a)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
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xbmc.spec 13 Dec 2012 08:09:29 -0000 1.55
+++ xbmc.spec 13 Dec 2012 18:45:50 -0000 1.56
@@ -5,7 +5,7 @@
Name: xbmc
Version: 12.0
-Release: 0.3.%{PRERELEASE}%{?dist}
+Release: 0.4.%{PRERELEASE}%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -23,6 +23,12 @@
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
Patch2: xbmc-12.0-dvdread.patch
@@ -170,12 +176,12 @@
%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
@@ -226,6 +232,7 @@
%setup -q -a 2 -n %{name}-%{DIRVERSION}
+%patch1 -p1
%patch2 -p0
#patch3 -p0
%patch4 -p1
@@ -258,6 +265,7 @@
--enable-goom \
--enable-external-libraries \
--enable-pulse \
+--enable-pvraddons-with-dependencies \
%if 0%{?_with_libssh} == 0
--disable-ssh \
%endif
@@ -334,6 +342,12 @@
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)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(a)ktdreyer.com> - 12.0-0.3.Frodo_rc1
- Update to Frodo RC 1
11 years, 11 months
rpms/xbmc/devel xbmc-pvr-addons-generate-tarball-xz.sh, NONE, 1.1 .cvsignore, 1.15, 1.16 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.54, 1.55 xbmc-12.0-bootstrap.patch, 1.1, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4385
Modified Files:
.cvsignore sources xbmc-12.0-hdhomerun.patch
xbmc-generate-tarball-xz.sh xbmc.spec
Added Files:
xbmc-pvr-addons-generate-tarball-xz.sh
Removed Files:
xbmc-12.0-bootstrap.patch
Log Message:
* Wed Dec 12 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 12.0-0.3.Frodo_rc1
- Update to Frodo RC 1
--- 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: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 4 Oct 2012 23:38:57 -0000 1.15
+++ .cvsignore 13 Dec 2012 08:09:29 -0000 1.16
@@ -1 +1,2 @@
-xbmc-12.0-Frodo_alpha6-patched.tar.xz
+xbmc-12.0-Frodo_rc1-patched.tar.xz
+xbmc-pvr-addons-1e666ced21-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 4 Oct 2012 23:38:57 -0000 1.17
+++ sources 13 Dec 2012 08:09:29 -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/devel/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 4 Oct 2012 23:37:23 -0000 1.1
+++ xbmc-12.0-hdhomerun.patch 13 Dec 2012 08:09:29 -0000 1.2
@@ -1,4 +1,4 @@
-commit 896387e8d0f501b6f46336dd5928d1e71914486c
+commit c6db60512b4ed9d9252a9234935b23fb1b970080
Author: Ken Dreyer <ktdreyer(a)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-@ARCH@.so $(CMYTH)
-+libs: libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
+-libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
++libs: imagelib libexif system/libcpluff-@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/devel/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 4 Oct 2012 23:37:23 -0000 1.15
+++ xbmc-generate-tarball-xz.sh 13 Dec 2012 08:09:29 -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/devel/xbmc.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xbmc.spec 24 Nov 2012 15:24:58 -0000 1.54
+++ xbmc.spec 13 Dec 2012 08:09:29 -0000 1.55
@@ -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.3.%{PRERELEASE}%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -19,9 +19,9 @@
# 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
# filed ticket, but patch still needs work
# http://trac.xbmc.org/ticket/9658
@@ -60,6 +60,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 +79,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,6 +167,9 @@
BuildRequires: swig
BuildRequires: java-devel
BuildRequires: lame-devel
+%if 0%{?_with_libssh}
+BuildRequires: libssh-devel
+%endif
# nfs-utils-lib-devel package currently broken
#BuildRequires: nfs-utils-lib-devel
@@ -216,22 +224,22 @@
%prep
-%setup -q -n %{name}-%{DIRVERSION}
+%setup -q -a 2 -n %{name}-%{DIRVERSION}
-%patch1 -p0
%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 +258,9 @@
--enable-goom \
--enable-external-libraries \
--enable-pulse \
+%if 0%{?_with_libssh} == 0
+--disable-ssh \
+%endif
--disable-dvdcss \
--disable-optimizations --disable-debug \
CPPFLAGS="-I/usr/include/ffmpeg" \
@@ -323,8 +334,27 @@
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
-* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.0-0.2.Frodo_alpha6
-- Rebuilt for FFmpeg 1.0
+* Wed Dec 12 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 12.0-0.3.Frodo_rc1
+- Update to Frodo RC 1
+
+* Wed Dec 05 2012 Ken Dreyer <ktdreyer(a)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(a)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(a)ktdreyer.com> - 12.0-0.2.Frodo_alpha7
+- Add pvr addons
+
+* Tue Nov 13 2012 Ken Dreyer <ktdreyer(a)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
--- xbmc-12.0-bootstrap.patch DELETED ---
11 years, 11 months
rpms/xtables-addons-kmod/F-18 xtables-addons-kmod.spec,1.29,1.30
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20864
Modified Files:
xtables-addons-kmod.spec
Log Message:
* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.47.1-1.2
- Rebuilt for current f18 kernel
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-18/xtables-addons-kmod.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xtables-addons-kmod.spec 25 Nov 2012 22:11:42 -0000 1.29
+++ xtables-addons-kmod.spec 12 Dec 2012 10:54:11 -0000 1.30
@@ -8,7 +8,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 1.47.1
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@
rm -rf %{buildroot}
%changelog
+* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.47.1-1.2
+- Rebuilt for current f18 kernel
+
* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.47.1-1.1
- Rebuilt for current f18 kernel
11 years, 11 months
rpms/west-chamber-kmod/F-18 west-chamber-kmod.spec,1.16,1.17
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/west-chamber-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20733
Modified Files:
west-chamber-kmod.spec
Log Message:
* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.8
- Rebuilt for current f18 kernel
Index: west-chamber-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber-kmod/F-18/west-chamber-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- west-chamber-kmod.spec 25 Nov 2012 22:11:32 -0000 1.16
+++ west-chamber-kmod.spec 12 Dec 2012 10:53:59 -0000 1.17
@@ -11,7 +11,7 @@
Name: west-chamber-kmod
Summary: Kernel module (kmod) for west-chamber
Version: 0.0.1
-Release: 7.%{?svndate}svn%{?dist}.7
+Release: 7.%{?svndate}svn%{?dist}.8
License: GPLv2+
Group: System Environment/Kernel
URL: http://code.google.com/p/scholarzhang/
@@ -81,6 +81,9 @@
rm -rf %{buildroot}
%changelog
+* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.8
+- Rebuilt for current f18 kernel
+
* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn.7
- Rebuilt for current f18 kernel
11 years, 11 months
rpms/VirtualBox-kmod/F-18 VirtualBox-kmod.spec,1.12,1.13
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20612
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.4-1.3
- Rebuilt for current f18 kernel
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-18/VirtualBox-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- VirtualBox-kmod.spec 25 Nov 2012 22:11:23 -0000 1.12
+++ VirtualBox-kmod.spec 12 Dec 2012 10:53:47 -0000 1.13
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.2.4
-Release: 1%{?prerel:.%{prerel}}%{?dist}.2
+Release: 1%{?prerel:.%{prerel}}%{?dist}.3
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Wed Dec 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.4-1.3
+- Rebuilt for current f18 kernel
+
* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.4-1.2
- Rebuilt for current f18 kernel
11 years, 11 months