rpms/guvcview/F-18 .cvsignore, 1.12, 1.13 guvcview.spec, 1.15, 1.16 sources, 1.12, 1.13
by Thomas Moschny
Author: thm
Update of /cvs/free/rpms/guvcview/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1312/F-18
Modified Files:
.cvsignore guvcview.spec sources
Log Message:
Update to the released 1.6.1 version.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-18/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 16 Jul 2012 18:04:53 -0000 1.12
+++ .cvsignore 7 Oct 2012 14:23:43 -0000 1.13
@@ -1 +1 @@
-guvcview-src-v1.6.0-6-gd7e9ed3.tar.gz
+guvcview-src-1.6.1.tar.gz
Index: guvcview.spec
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-18/guvcview.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- guvcview.spec 17 Jul 2012 08:13:56 -0000 1.15
+++ guvcview.spec 7 Oct 2012 14:23:43 -0000 1.16
@@ -1,14 +1,13 @@
Name: guvcview
Version: 1.6.1
-Release: 0.1.20120714gitd7e9ed30%{?dist}
+Release: 1%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
# fixme: ask upstream about license, many source files claim to be
# under GPLv2+
License: GPLv3+
URL: http://guvcview.sourceforge.net/
-#Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-Source0: guvcview-src-v1.6.0-6-gd7e9ed3.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0
@@ -35,8 +34,7 @@
%prep
-#setup -q -n %{name}-src-%{version}
-%setup -q -c %{name}-src-%{version}
+%setup -q -n %{name}-src-%{version}
find src -type f -exec chmod u=rw,go=r {} \;
@@ -76,6 +74,9 @@
%changelog
+* Sun Oct 7 2012 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.1-1
+- Update to the released 1.6.1 version.
+
* Mon Jul 16 2012 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.1-0.1.20120714gitd7e9ed30
- Update to latest git version, for FFmpeg compatibility.
- Pulseaudio support is enabled per default now.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-18/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 16 Jul 2012 18:04:54 -0000 1.12
+++ sources 7 Oct 2012 14:23:43 -0000 1.13
@@ -1 +1 @@
-c39bcf55d96f6ea1c663fee89e0836d7 guvcview-src-v1.6.0-6-gd7e9ed3.tar.gz
+b3dfd04d8aae0c807d5f5d6ba035580f guvcview-src-1.6.1.tar.gz
11 years, 6 months
rpms/guvcview/devel .cvsignore, 1.12, 1.13 guvcview.spec, 1.15, 1.16 sources, 1.12, 1.13
by Thomas Moschny
Author: thm
Update of /cvs/free/rpms/guvcview/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32509/devel
Modified Files:
.cvsignore guvcview.spec sources
Log Message:
Update to the released 1.6.1 version.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/guvcview/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 16 Jul 2012 18:04:53 -0000 1.12
+++ .cvsignore 7 Oct 2012 13:48:25 -0000 1.13
@@ -1 +1 @@
-guvcview-src-v1.6.0-6-gd7e9ed3.tar.gz
+guvcview-src-1.6.1.tar.gz
Index: guvcview.spec
===================================================================
RCS file: /cvs/free/rpms/guvcview/devel/guvcview.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- guvcview.spec 17 Jul 2012 08:13:56 -0000 1.15
+++ guvcview.spec 7 Oct 2012 13:48:25 -0000 1.16
@@ -1,14 +1,13 @@
Name: guvcview
Version: 1.6.1
-Release: 0.1.20120714gitd7e9ed30%{?dist}
+Release: 1%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
# fixme: ask upstream about license, many source files claim to be
# under GPLv2+
License: GPLv3+
URL: http://guvcview.sourceforge.net/
-#Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-Source0: guvcview-src-v1.6.0-6-gd7e9ed3.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0
@@ -35,8 +34,7 @@
%prep
-#setup -q -n %{name}-src-%{version}
-%setup -q -c %{name}-src-%{version}
+%setup -q -n %{name}-src-%{version}
find src -type f -exec chmod u=rw,go=r {} \;
@@ -76,6 +74,9 @@
%changelog
+* Sun Oct 7 2012 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.1-1
+- Update to the released 1.6.1 version.
+
* Mon Jul 16 2012 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.1-0.1.20120714gitd7e9ed30
- Update to latest git version, for FFmpeg compatibility.
- Pulseaudio support is enabled per default now.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/guvcview/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 16 Jul 2012 18:04:54 -0000 1.12
+++ sources 7 Oct 2012 13:48:25 -0000 1.13
@@ -1 +1 @@
-c39bcf55d96f6ea1c663fee89e0836d7 guvcview-src-v1.6.0-6-gd7e9ed3.tar.gz
+b3dfd04d8aae0c807d5f5d6ba035580f guvcview-src-1.6.1.tar.gz
11 years, 6 months
rpms/openafs-kmod/F-18 openafs-kmod.spec,1.23,1.24
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2223
Modified Files:
openafs-kmod.spec
Log Message:
* 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: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-18/openafs-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- openafs-kmod.spec 20 Sep 2012 02:23:37 -0000 1.23
+++ openafs-kmod.spec 6 Oct 2012 19:50:45 -0000 1.24
@@ -1,5 +1,5 @@
# (un)define the next line to either build for the newest or all current kernels
-%define buildforkernels akmod
+%define buildforkernels newest
# Define the OpenAFS sysname
%ifarch %{ix86}
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -147,6 +147,9 @@
%changelog
+* 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.
+
* Wed Sep 19 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-3
- Add upstream patches for kernel 3.6
11 years, 6 months
rpms/openafs-kmod/devel openafs-kmod.spec,1.22,1.23
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1080
Modified Files:
openafs-kmod.spec
Log Message:
* 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: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- openafs-kmod.spec 20 Sep 2012 02:02:20 -0000 1.22
+++ openafs-kmod.spec 6 Oct 2012 19:31:16 -0000 1.23
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -147,6 +147,9 @@
%changelog
+* 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.
+
* Wed Sep 19 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-3
- Add upstream patches for kernel 3.6
11 years, 6 months
rpms/qtractor-freeworld/devel .cvsignore, 1.2, 1.3 qtractor-freeworld.spec, 1.1, 1.2 sources, 1.2, 1.3
by Brendan Jones
Author: bsjones
Update of /cvs/free/rpms/qtractor-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1952/devel
Modified Files:
.cvsignore qtractor-freeworld.spec sources
Log Message:
Update to 0.5.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qtractor-freeworld/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Sep 2012 04:17:00 -0000 1.2
+++ .cvsignore 6 Oct 2012 06:07:31 -0000 1.3
@@ -1 +1 @@
-qtractor-0.5.5.tar.gz
+qtractor-0.5.6.tar.gz
Index: qtractor-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qtractor-freeworld/devel/qtractor-freeworld.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtractor-freeworld.spec 3 Sep 2012 04:17:00 -0000 1.1
+++ qtractor-freeworld.spec 6 Oct 2012 06:07:31 -0000 1.2
@@ -10,8 +10,8 @@
Summary: Audio/MIDI multi-track sequencer
Name: qtractor-freeworld
-Version: 0.5.5
-Release: 3%{?dist}
+Version: 0.5.6
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://qtractor.sourceforge.net/
@@ -26,7 +26,7 @@
BuildRequires: autoconf
BuildRequires: automake
-Requires: qtractor%{?_isa} = %{version}
+Requires: qtractor%{?_isa} >= %{version}
Obsoletes: qtractor < 0.5.5
%description
@@ -77,6 +77,12 @@
%{_libdir}/qtractor
%changelog
+* Sat Oct 06 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.6-1
+- Rebuild for qtractor 0.5.6
+
+* Fri Sep 14 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.5-4
+- Correct Requires.
+
* Wed Aug 15 2012 Brendan Jones <brendan.jones.it(a)gmail.com> 0.5.5-2
- Correct directory ownership
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qtractor-freeworld/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Sep 2012 04:17:00 -0000 1.2
+++ sources 6 Oct 2012 06:07:31 -0000 1.3
@@ -1 +1 @@
-ec3ad0f427a9e629fb0c42d10b4c2259 qtractor-0.5.5.tar.gz
+1483f37c6228cab8eaee3ac1c03ded6e qtractor-0.5.6.tar.gz
11 years, 6 months
rpms/x264/devel .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 x264-snapshot.sh, 1.4, 1.5 x264.spec, 1.47, 1.48
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3121
Modified Files:
.cvsignore sources x264-snapshot.sh x264.spec
Log Message:
* Sat Oct 06 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-4.20121006git68dfb7b
- Note: no source update.
- Just add git tag to package name, for faster check upstream.
- Add git tag in x264-snapshot.sh .
- Convert all defines in global.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 9 Sep 2012 03:44:38 -0000 1.23
+++ .cvsignore 6 Oct 2012 00:04:51 -0000 1.24
@@ -1 +1 @@
-x264-stable-20120909.tar.bz2
+x264-stable-20121006-68dfb7b.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 9 Sep 2012 03:44:38 -0000 1.23
+++ sources 6 Oct 2012 00:04:51 -0000 1.24
@@ -1 +1 @@
-c8cf985a5c6dc213d01a26af79153156 x264-stable-20120909.tar.bz2
+bf71d1de57328c53e42af7d0429eeb0e x264-stable-20121006-68dfb7b.tar.bz2
Index: x264-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-snapshot.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x264-snapshot.sh 24 Aug 2011 15:32:19 -0000 1.4
+++ x264-snapshot.sh 6 Oct 2012 00:04:51 -0000 1.5
@@ -20,10 +20,11 @@
pushd "$tmp"
git clone git://git.videolan.org/${package}.git -b ${branch}
cd ${package}
+tag=$(git rev-list HEAD -n 1 | cut -c 1-7)
git checkout ${commit}
git checkout -b rpmfusion
./version.sh > version.h
git add version.h
git commit -m "generated version.h" version.h
-git archive --prefix="${package}-${branch}-${date}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2
+git archive --prefix="${package}-${branch}-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}-${tag}.tar.bz2
popd >/dev/null
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- x264.spec 9 Sep 2012 18:33:30 -0000 1.47
+++ x264.spec 6 Oct 2012 00:04:51 -0000 1.48
@@ -1,5 +1,8 @@
-%global snapshot 20120909
-%global branch stable
+%global gitdate 20121006
+%global gitversion 68dfb7b
+%global snapshot %{gitdate}-%{gitversion}
+%global gver .%{gitdate}git%{gitversion}
+%global branch stable
#global _with_bootstrap 1
@@ -20,7 +23,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.125
-Release: 4.%{snapshot}%{?dist}
+Release: 5%{?gver}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -65,7 +68,7 @@
This package contains the development files.
-%define x_configure \
+%global x_configure \
./configure \\\
--prefix=%{_prefix} \\\
--exec-prefix=%{_exec_prefix} \\\
@@ -186,6 +189,12 @@
%{_libdir}/libx26410b.so
%changelog
+* Sat Oct 06 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-4.20121006git68dfb7b
+- Note: no source update.
+- Just add git tag to package name, for faster check upstream.
+- Add git tag in x264-snapshot.sh .
+- Convert all defines in global.
+
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-4.20120909
- unbootstrap on F18.
11 years, 6 months
rpms/xbmc/devel .cvsignore,1.14,1.15 sources,1.16,1.17
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24550
Modified Files:
.cvsignore sources
Log Message:
Upload patched sources.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 25 Mar 2012 21:26:26 -0000 1.14
+++ .cvsignore 4 Oct 2012 23:38:57 -0000 1.15
@@ -1 +1 @@
-xbmc-11.0-patched.tar.xz
+xbmc-12.0-Frodo_alpha6-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 25 Mar 2012 21:26:26 -0000 1.16
+++ sources 4 Oct 2012 23:38:57 -0000 1.17
@@ -1 +1 @@
-139970aef7a228ac78486aea0d361d98 xbmc-11.0-patched.tar.xz
+af5452648db87e2a1243cb9121f48229 xbmc-12.0-Frodo_alpha6-patched.tar.xz
11 years, 6 months
rpms/xbmc/devel xbmc-12.0-bootstrap.patch, NONE, 1.1 xbmc-12.0-dvdread.patch, NONE, 1.1 xbmc-12.0-hdhomerun.patch, NONE, 1.1 xbmc-generate-tarball-xz.sh, 1.14, 1.15 xbmc.spec, 1.52, 1.53 xbmc-11.0-bootstrap.patch, 1.1, NONE xbmc-11.0-dvdread.patch, 1.1, NONE xbmc-11.0-hdhomerun.patch, 1.1, NONE
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24424
Modified Files:
xbmc-generate-tarball-xz.sh xbmc.spec
Added Files:
xbmc-12.0-bootstrap.patch xbmc-12.0-dvdread.patch
xbmc-12.0-hdhomerun.patch
Removed Files:
xbmc-11.0-bootstrap.patch xbmc-11.0-dvdread.patch
xbmc-11.0-hdhomerun.patch
Log Message:
- Update to Frodo alpha 6
- Use "12.0" as version, rather than "12.8"
- Drop desktop patch (now in Frodo alpha6)
- Add BR for taglib-devel >= 1.8 (libid3tag is being phased out)
- BR for swig and java-devel
- Add CFLAGS option to recognize Samba 4.0 (in f18+)
- Rebase patches to 12.0/Frodo where necessary
xbmc-12.0-bootstrap.patch:
bootstrap | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE xbmc-12.0-bootstrap.patch ---
--- bootstrap.orig 2012-10-04 15:35:08.580601064 -0400
+++ bootstrap 2012-10-04 15:35:38.067597210 -0400
@@ -11,7 +11,8 @@
# order matters with libdvd and friends
[ -d lib/libdvd/libdvdcss ] && \
autoreconf -vif lib/libdvd/libdvdcss
-autoreconf -vif lib/libdvd/libdvdread
+[ -d lib/libdvd/libdvdread ] && \
+ autoreconf -vif lib/libdvd/libdvdread
autoreconf -vif lib/libdvd/libdvdnav
autoreconf -vif lib/gtest
xbmc-12.0-dvdread.patch:
configure.in | 21 +--------------------
lib/libdvd/Makefile.in | 13 ++++++-------
2 files changed, 7 insertions(+), 27 deletions(-)
--- NEW FILE xbmc-12.0-dvdread.patch ---
--- 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 @@
--with-pic
], [$SKIP_CONFIG_DVDCSS])
-XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
- ./configure2 \
- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \
- --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" &&
- $MAKE dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
-], [0])
-
XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
./configure2 \
- --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" \
--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 @@
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 @@
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)
@@ -48,9 +47,9 @@
$(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 +58,8 @@
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)
xbmc-12.0-hdhomerun.patch:
Makefile.in | 5 --
configure.in | 1
xbmc/filesystem/DllHDHomeRun.h | 78 +++++++++++++++++++++++++++--------------
3 files changed, 53 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-12.0-hdhomerun.patch ---
commit 896387e8d0f501b6f46336dd5928d1e71914486c
Author: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Fri Aug 24 19:34:47 2012 -0600
Fedora: use internal hdhomerun
Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
diff --git a/Makefile.in b/Makefile.in
index 6be215f..1120178 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -141,7 +141,6 @@ endif
LIB_DIRS=\
lib/cximage-6.0 \
lib/libexif \
- lib/libhdhomerun \
lib/libid3tag \
lib/libapetag \
lib/cpluff \
@@ -295,8 +294,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
codecs: papcodecs dvdpcodecs
-libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
+libs: libid3tag 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
--- a/configure.in
+++ b/configure.in
@@ -2041,7 +2041,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 \
diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
index 8d80cfe..a1134c5 100644
--- a/xbmc/filesystem/DllHDHomeRun.h
+++ b/xbmc/filesystem/DllHDHomeRun.h
@@ -21,7 +21,7 @@
*/
#include "DynamicDll.h"
-#include "lib/libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
class DllHdHomeRunInterface
{
@@ -42,30 +42,56 @@ public:
class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
{
- DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
- DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
- DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
- DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, size_t p2, size_t* p3))
- DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
- DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
- RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
- RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
- END_METHOD_RESOLVE()
+public:
+ virtual ~DllHdHomeRun () {};
+
+ virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
+ { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
+
+ virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
+ { return ::hdhomerun_device_create_from_str (p1, p2); }
+
+ virtual void device_destroy (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_destroy (p1); }
+
+ virtual int device_stream_start (struct hdhomerun_device_t* p1)
+ { return ::hdhomerun_device_stream_start (p1); }
+
+
+ virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
+ {
+ uint8_t *retval;
+
+ size_t tmp = *p3;
+ retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
+ *p3 = tmp;
+
+ return retval;
+ }
+
+ virtual void device_stream_stop (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_stream_stop (p1); }
+
+ virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
+
+ virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_program (p1, p2); }
+
+
+ virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
+
+
+ virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
+ { ::hdhomerun_device_set_tuner (p1, p2); }
+
+ virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
+ { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
+
+ // DLL faking.
+ virtual bool ResolveExports() { return true; }
+ virtual bool Load() { return true; }
+ virtual void Unload() {}
};
Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xbmc-generate-tarball-xz.sh 25 Mar 2012 21:26:26 -0000 1.14
+++ xbmc-generate-tarball-xz.sh 4 Oct 2012 23:37:23 -0000 1.15
@@ -1,25 +1,27 @@
#!/bin/sh
-MAJORVERSION=11
+MAJORVERSION=12
MINORVERSION=0
-#PRERELEASE=Eden_rc2
+PRERELEASE=Frodo_alpha6
VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
-# GITHUBURL below is obsolete, I think
#GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Eden
+GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
-# comment-out line below if using tarball
-#curl -L $GITHUBURL | tar xz
+# download zipball
+if [[ ! -f xbmc-$VERSION.zip ]]; then
+ curl -o xbmc-$VERSION.zip -L $GITHUBURL
+fi
+
+# extract zipball
+rm -r xbmc-xbmc-*
+unzip xbmc-$VERSION.zip
# Repair GitHub's odd auto-generated top-level directory...
-#mv xbmc-xbmc-* xbmc-$VERSION
+mv xbmc-xbmc-* xbmc-$VERSION
-# extract tarball
-# comment-out if not using tarball
-tar -xzvf xbmc-$VERSION.tar.gz
-
-cd xbmc-$VERSION
+pushd xbmc-$VERSION
# remove bundled libraries, saves space and forces using external versions
# grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream
@@ -62,7 +64,7 @@
rm -r tools/$i
done
-cd ..
+popd
# repack
tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xbmc.spec 4 Oct 2012 21:49:02 -0000 1.52
+++ xbmc.spec 4 Oct 2012 23:37:23 -0000 1.53
@@ -1,6 +1,6 @@
%global PRERELEASE Frodo_alpha6
#global DIRVERSION %{version}
-# use below for pre-release
+# use the line below for pre-releases
%global DIRVERSION %{version}-%{PRERELEASE}
Name: xbmc
@@ -158,6 +158,8 @@
%endif
BuildRequires: taglib-devel >= 1.8
BuildRequires: swig
+BuildRequires: java-devel
+BuildRequires: lame-devel
# nfs-utils-lib-devel package currently broken
#BuildRequires: nfs-utils-lib-devel
@@ -245,11 +247,12 @@
--with-lirc-device=/var/run/lirc/lircd \
--enable-goom \
--enable-external-libraries \
+--enable-pulse \
--disable-dvdcss \
--disable-optimizations --disable-debug \
CPPFLAGS="-I/usr/include/ffmpeg" \
-CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
-CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
+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" \
LDFLAGS="-fPIC" \
LIBS="-L%{_libdir}/mysql %{?_with_hdhomerun:-lhdhomerun} $LIBS" \
ASFLAGS=-fPIC
@@ -291,7 +294,7 @@
%files
%defattr(-,root,root)
-%doc copying.txt keymapping.txt LICENSE.GPL README
+%doc copying.txt CONTRIBUTORS LICENSE.GPL README
%doc docs
%{_bindir}/xbmc
%{_bindir}/xbmc-standalone
@@ -323,7 +326,8 @@
- Use "12.0" as version, rather than "12.8"
- Drop desktop patch (now in Frodo alpha6)
- Add BR for taglib-devel >= 1.8 (libid3tag is being phased out)
-- BR for swig
+- BR for swig and java-devel
+- Add CFLAGS option to recognize Samba 4.0 (in f18+)
- Rebase patches to 12.0/Frodo where necessary
* Sun Aug 28 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 12.8-0.1.Frodo_alpha4
--- xbmc-11.0-bootstrap.patch DELETED ---
--- xbmc-11.0-dvdread.patch DELETED ---
--- xbmc-11.0-hdhomerun.patch DELETED ---
11 years, 6 months
rpms/xbmc/devel xbmc.spec,1.51,1.52
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20827
Modified Files:
xbmc.spec
Log Message:
BuildRequires for swig
11 years, 6 months
rpms/ffmpeg/devel .cvsignore, 1.36, 1.37 ffmpeg.spec, 1.66, 1.67 sources, 1.36, 1.37 ffmpeg-0.10.4-backport-libv4l2.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18626
Modified Files:
.cvsignore ffmpeg.spec sources
Removed Files:
ffmpeg-0.10.4-backport-libv4l2.patch
Log Message:
* Thu Oct 04 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-1
- Updated to 1.0
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Dropped the included patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 14 Jun 2012 17:21:18 -0000 1.36
+++ .cvsignore 4 Oct 2012 20:39:33 -0000 1.37
@@ -1 +1 @@
-ffmpeg-0.11.1.tar.bz2
+ffmpeg-1.0.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ffmpeg.spec 5 Sep 2012 22:15:48 -0000 1.66
+++ ffmpeg.spec 4 Oct 2012 20:39:33 -0000 1.67
@@ -11,14 +11,13 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.11.1
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 1.0
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
License: GPLv2+
%endif
-Group: Applications/Multimedia
URL: http://ffmpeg.org/
%if 0%{?date}
Source0: ffmpeg-%{?branch}%{date}.tar.bz2
@@ -26,8 +25,6 @@
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
%endif
Source1: ffmpeg-snapshot-oldabi.sh
-Patch0: ffmpeg-0.10.4-backport-libv4l2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: bzip2-devel
%{!?_without_celt:BuildRequires: celt-devel}
@@ -80,7 +77,6 @@
%package libs
Summary: Libraries for %{name}
-Group: System Environment/Libraries
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -91,7 +87,6 @@
%package devel
Summary: Development package for %{name}
-Group: Development/Libraries
Requires: %{name}-libs%{_isa} = %{version}-%{release}
Requires: pkgconfig
@@ -158,7 +153,6 @@
%else
%setup -q -n ffmpeg-%{version}
%endif
-%patch0 -p1
%build
mkdir generic
@@ -233,9 +227,6 @@
popd
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post libs -p /sbin/ldconfig
@@ -243,7 +234,6 @@
%if 0%{!?ffmpegsuffix:1}
%files
-%defattr(-,root,root,-)
%doc COPYING.* CREDITS README doc/ffserver.conf
%{_bindir}/ffmpeg
%{_bindir}/ffplay
@@ -258,7 +248,6 @@
%endif
%files libs
-%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
%if 0%{!?ffmpegsuffix:1}
%ifarch sparc sparc64
@@ -267,7 +256,6 @@
%endif
%files devel
-%defattr(-,root,root,-)
%doc MAINTAINERS doc/APIchanges doc/*.txt
%{_includedir}/ffmpeg
%{_libdir}/pkgconfig/lib*.pc
@@ -280,6 +268,11 @@
%changelog
+* Thu Oct 04 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-1
+- Updated to 1.0
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Dropped the included patch
+
* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.11.1-3
- Rebuilt for x264 ABI 125
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources 14 Jun 2012 17:21:18 -0000 1.36
+++ sources 4 Oct 2012 20:39:33 -0000 1.37
@@ -1 +1 @@
-ff8cb914f657e164dd60ea1008b555a8 ffmpeg-0.11.1.tar.bz2
+3ed526cea20c1bffb5a37f7730f710bd ffmpeg-1.0.tar.bz2
--- ffmpeg-0.10.4-backport-libv4l2.patch DELETED ---
11 years, 6 months