rpms/gpac/devel gpac-ppc64.patch,NONE,1.1 gpac.spec,1.3,1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29308
Modified Files:
gpac.spec
Added Files:
gpac-ppc64.patch
Log Message:
WTF - don't follow ffmpeg configure sample - please
gpac-ppc64.patch:
--- NEW FILE gpac-ppc64.patch ---
diff -up gpac/configure~ gpac/configure
--- gpac/configure~ 2008-12-17 14:58:05.000000000 +0100
+++ gpac/configure 2008-12-18 23:10:50.000000000 +0100
@@ -236,6 +236,10 @@ case "$cpu" in
alpha)
cpu="alpha"
;;
+ ppc64)
+ cpu="powerpc"
+ libdir="lib64"
+ ;;
"Power Macintosh"|ppc)
cpu="powerpc"
;;
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpac.spec 17 Dec 2008 14:18:44 -0000 1.3
+++ gpac.spec 18 Dec 2008 22:16:26 -0000 1.4
@@ -19,7 +19,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -33,6 +33,7 @@
Patch4: gpac-0.4.5-system_openjpeg.patch
Patch6: gpac-0.4.5-shared_sggen.patch
Patch7: gpac-0.4.5-libxml2.patch
+Patch8: gpac-ppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@@ -150,6 +151,7 @@
%patch4 -p1 -b .openjpeg
%patch6 -p1 -b .shared
%patch7 -p1 -b .libxml2
+%patch8 -p1 -b .ppc64
## kwizart - enable dynamic mode - hardcoded with patch2
# define SONAME number from the first number of gpac version.
@@ -326,6 +328,9 @@
%endif
%changelog
+* Thu Dec 18 2008 kwizart < kwizart at gmail.com > - 0.4.5-2
+- Fix for ppc64
+
* Wed Dec 17 2008 kwizart < kwizart at gmail.com > - 0.4.5-1
- Update to 0.4.5 (final)
- Drop upstreamed patches - Rewrite some
15 years, 5 months
rpms/mplayer/devel .cvsignore, 1.7, 1.8 mplayer-x86_32-compile.patch, 1.2, 1.3 mplayer.spec, 1.11, 1.12 sources, 1.8, 1.9
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19515
Modified Files:
.cvsignore mplayer-x86_32-compile.patch mplayer.spec sources
Log Message:
- 20081218 snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 4 Dec 2008 23:37:06 -0000 1.7
+++ .cvsignore 18 Dec 2008 19:32:41 -0000 1.8
@@ -1,2 +1,2 @@
-mplayer-export-2008-12-04.tar.bz2
+mplayer-export-2008-12-18.tar.bz2
Blue-1.7.tar.bz2
mplayer-x86_32-compile.patch:
Index: mplayer-x86_32-compile.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-x86_32-compile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-x86_32-compile.patch 4 Dec 2008 23:37:06 -0000 1.2
+++ mplayer-x86_32-compile.patch 18 Dec 2008 19:32:41 -0000 1.3
@@ -1,27 +1,11 @@
-diff -up mplayer-export-2008-12-04/libavcodec/Makefile.compile mplayer-export-2008-12-04/libavcodec/Makefile
---- mplayer-export-2008-12-04/libavcodec/Makefile.compile 2008-12-02 17:48:05.000000000 +0100
-+++ mplayer-export-2008-12-04/libavcodec/Makefile 2008-12-05 00:20:51.000000000 +0100
-@@ -99,6 +99,11 @@ OBJS-$(CONFIG_H263I_DECODER) +
- OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
- OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
- OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o
-+# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm'
-+# on ix86 in cabac.h
+diff -up mplayer-export-2008-12-18/libavcodec/Makefile.compile mplayer-export-2008-12-18/libavcodec/Makefile
+--- mplayer-export-2008-12-18/libavcodec/Makefile.compile 2008-12-17 01:54:54.000000000 +0100
++++ mplayer-export-2008-12-18/libavcodec/Makefile 2008-12-18 19:44:49.000000000 +0100
+@@ -505,3 +505,7 @@ include $(SUBDIR)../subdir.mak
+
+ $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)fdctref.o $(SUBDIR)aandcttab.o
+ $(SUBDIR)fft-test$(EXESUF): $(SUBDIR)fdctref.o
+ifeq ($(ARCH_X86_32),yes)
-+h264.o: CFLAGS += -fomit-frame-pointer
++$(SUBDIR)i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
++$(SUBDIR)h264.o: CFLAGS += -fomit-frame-pointer
+endif
- OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o
- OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
- OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
-@@ -397,6 +402,11 @@ MMX-OBJS-$(CONFIG_ENCODERS) +
- MMX-OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o
- MMX-OBJS-$(CONFIG_GPL) += i386/idct_mmx.o
- MMX-OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o
-+# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm'
-+# on ix86 in snowdsp_mmx.o
-+ifeq ($(ARCH_X86_32),yes)
-+i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
-+endif
- MMX-OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o
- MMX-OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
- MMX-OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mplayer.spec 4 Dec 2008 23:37:06 -0000 1.11
+++ mplayer.spec 18 Dec 2008 19:32:41 -0000 1.12
@@ -1,7 +1,7 @@
%define codecdir %{_libdir}/codecs
-%define pre 20081204svn
+%define pre 20081218svn
%define svn 1
-%define svnbuild 2008-12-04
+%define svnbuild 2008-12-18
%define faad2min 1:2.6.1
Name: mplayer
@@ -346,8 +346,8 @@
%changelog
-* Thu Dec 04 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.104.20081204svn
-- 20081204 snapshot
+* Thu Dec 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.104.20081218svn
+- 20081218 snapshot
- dropped obsolete/upstreamed patches
* Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.103.20080903svn
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 4 Dec 2008 23:37:06 -0000 1.8
+++ sources 18 Dec 2008 19:32:41 -0000 1.9
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-15f75a17a779247aba1301ece4629920 mplayer-export-2008-12-04.tar.bz2
+a1034c489750f70af6e7696a0cd509c7 mplayer-export-2008-12-18.tar.bz2
15 years, 5 months
rpms/fglrx-kmod/F-9 fglrx-kmod.spec,1.14,1.15
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6044
Modified Files:
fglrx-kmod.spec
Log Message:
Re-enable newest macro
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/fglrx-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fglrx-kmod.spec 16 Dec 2008 20:03:18 -0000 1.14
+++ fglrx-kmod.spec 18 Dec 2008 15:46:11 -0000 1.15
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
%define ativersion 8.12
15 years, 5 months
rpms/open-vm-tools/devel .cvsignore, 1.2, 1.3 open-vm-tools.spec, 1.1, 1.2 sources, 1.2, 1.3
by Denis Leroy
Author: denis
Update of /cvs/free/rpms/open-vm-tools/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12796
Modified Files:
.cvsignore open-vm-tools.spec sources
Log Message:
Update to upstream 130226. Desktop patch upstreamed
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Nov 2008 20:59:46 -0000 1.2
+++ .cvsignore 18 Dec 2008 07:57:19 -0000 1.3
@@ -1 +1 @@
-open-vm-tools-2008.10.10-123053.tar.gz
+open-vm-tools-2008.11.18-130226.tar.gz
Index: open-vm-tools.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/devel/open-vm-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- open-vm-tools.spec 10 Nov 2008 20:59:46 -0000 1.1
+++ open-vm-tools.spec 18 Dec 2008 07:57:19 -0000 1.2
@@ -1,9 +1,9 @@
-%define builddate 2008.10.10
-%define buildver 123053
+%define builddate 2008.11.18
+%define buildver 130226
Name: open-vm-tools
Version: 0.0.0.%{buildver}
-Release: 9%{?dist}
+Release: 1%{?dist}
Summary: VMware Guest OS Tools
Group: Applications/System
License: LGPLv2
@@ -13,7 +13,6 @@
Source2: %{name}-sysconfig.mouse
Source3: vmware-toolbox.desktop
Source4: %{name}-modprobe.vmnics
-Patch0: %{name}-123053-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i386 x86_64
@@ -53,7 +52,6 @@
%prep
%setup -q -n open-vm-tools-%{builddate}-%{buildver}
-%patch0 -p1 -b .desktop
# Fix some permissions and formats
chmod -x NEWS README ChangeLog AUTHORS COPYING
sed -i 's/\r//' README
@@ -161,6 +159,10 @@
%changelog
+* Thu Dec 18 2008 Denis Leroy <denis(a)poolshark.org> - 0.0.0.130226-1
+- Update to upstream 130226
+- Desktop patch upstreamed
+
* Mon Nov 10 2008 Denis Leroy <denis(a)poolshark.org> - 0.0.0.123053-9
- Some more cleanups
Index: sources
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Nov 2008 20:59:46 -0000 1.2
+++ sources 18 Dec 2008 07:57:19 -0000 1.3
@@ -1 +1 @@
-1c2ad0dea29c6e5b5b2f41fb43a97087 open-vm-tools-2008.10.10-123053.tar.gz
+03cedcf15193cafd320ff0f44348dd18 open-vm-tools-2008.11.18-130226.tar.gz
15 years, 5 months
rpms/open-vm-tools-kmod/F-10 .cvsignore, 1.2, 1.3 open-vm-tools-kmod.spec, 1.7, 1.8 sources, 1.2, 1.3
by Denis Leroy
Author: denis
Update of /cvs/free/rpms/open-vm-tools-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11039
Modified Files:
.cvsignore open-vm-tools-kmod.spec sources
Log Message:
Update to upstream 130226. Added new kernel module pvscsi
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Nov 2008 20:58:44 -0000 1.2
+++ .cvsignore 18 Dec 2008 07:29:36 -0000 1.3
@@ -1 +1 @@
-open-vm-tools-2008.10.10-123053.tar.gz
+open-vm-tools-2008.11.18-130226.tar.gz
Index: open-vm-tools-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/F-10/open-vm-tools-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- open-vm-tools-kmod.spec 6 Dec 2008 09:05:11 -0000 1.7
+++ open-vm-tools-kmod.spec 18 Dec 2008 07:29:36 -0000 1.8
@@ -6,13 +6,13 @@
%define buildforkernels newest
%define tname open-vm-tools
-%define builddate 2008.10.10
-%define buildver 123053
-%define ovtmodules vmblock vmci vmhgfs vmmemctl vmsync vmxnet vmxnet3 vsock
+%define builddate 2008.11.18
+%define buildver 130226
+%define ovtmodules vmblock vmci vmhgfs vmmemctl vmsync vmxnet vmxnet3 vsock pvscsi
Name: open-vm-tools-kmod
Version: 0.0.0.%{buildver}
-Release: 1%{?dist}.7
+Release: 1%{?dist}.1
Summary: VMware Tools Kernel Modules
Group: System Environment/Kernel
License: GPLv2
@@ -73,6 +73,10 @@
%changelog
+* Thu Dec 18 2008 Denis Leroy <denis(a)poolshark.org> - 0.0.0.130226-1.1
+- Update to upstream 130226
+- Added new kernel module pvscsi
+
* Sat Dec 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.0.123053-1.7
- rebuild for latest Fedora kernel;
Index: sources
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Nov 2008 20:58:44 -0000 1.2
+++ sources 18 Dec 2008 07:29:36 -0000 1.3
@@ -1 +1 @@
-1c2ad0dea29c6e5b5b2f41fb43a97087 open-vm-tools-2008.10.10-123053.tar.gz
+03cedcf15193cafd320ff0f44348dd18 open-vm-tools-2008.11.18-130226.tar.gz
15 years, 5 months
rpms/open-vm-tools/F-10 .cvsignore, 1.2, 1.3 open-vm-tools.spec, 1.1, 1.2 sources, 1.2, 1.3 open-vm-tools-123053-desktop.patch, 1.1, NONE
by Denis Leroy
Author: denis
Update of /cvs/free/rpms/open-vm-tools/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10722
Modified Files:
.cvsignore open-vm-tools.spec sources
Removed Files:
open-vm-tools-123053-desktop.patch
Log Message:
Update to upstream 130226. Desktop patch upstreamed
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Nov 2008 20:59:46 -0000 1.2
+++ .cvsignore 18 Dec 2008 07:21:58 -0000 1.3
@@ -1 +1 @@
-open-vm-tools-2008.10.10-123053.tar.gz
+open-vm-tools-2008.11.18-130226.tar.gz
Index: open-vm-tools.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-10/open-vm-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- open-vm-tools.spec 10 Nov 2008 20:59:46 -0000 1.1
+++ open-vm-tools.spec 18 Dec 2008 07:21:58 -0000 1.2
@@ -1,9 +1,9 @@
-%define builddate 2008.10.10
-%define buildver 123053
+%define builddate 2008.11.18
+%define buildver 130226
Name: open-vm-tools
Version: 0.0.0.%{buildver}
-Release: 9%{?dist}
+Release: 1%{?dist}
Summary: VMware Guest OS Tools
Group: Applications/System
License: LGPLv2
@@ -13,7 +13,6 @@
Source2: %{name}-sysconfig.mouse
Source3: vmware-toolbox.desktop
Source4: %{name}-modprobe.vmnics
-Patch0: %{name}-123053-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i386 x86_64
@@ -53,7 +52,6 @@
%prep
%setup -q -n open-vm-tools-%{builddate}-%{buildver}
-%patch0 -p1 -b .desktop
# Fix some permissions and formats
chmod -x NEWS README ChangeLog AUTHORS COPYING
sed -i 's/\r//' README
@@ -161,6 +159,10 @@
%changelog
+* Thu Dec 18 2008 Denis Leroy <denis(a)poolshark.org> - 0.0.0.130226-1
+- Update to upstream 130226
+- Desktop patch upstreamed
+
* Mon Nov 10 2008 Denis Leroy <denis(a)poolshark.org> - 0.0.0.123053-9
- Some more cleanups
Index: sources
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Nov 2008 20:59:46 -0000 1.2
+++ sources 18 Dec 2008 07:21:58 -0000 1.3
@@ -1 +1 @@
-1c2ad0dea29c6e5b5b2f41fb43a97087 open-vm-tools-2008.10.10-123053.tar.gz
+03cedcf15193cafd320ff0f44348dd18 open-vm-tools-2008.11.18-130226.tar.gz
--- open-vm-tools-123053-desktop.patch DELETED ---
15 years, 5 months
rpms/mythtv-themes/devel .cvsignore, 1.2, 1.3 mythtv-themes.spec, 1.1, 1.2 sources, 1.2, 1.3 myththemes-0.21-svnfixes.patch, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv-themes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26651
Modified Files:
.cvsignore mythtv-themes.spec sources
Removed Files:
myththemes-0.21-svnfixes.patch
Log Message:
* Wed Dec 17 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
- Build svn trunk themes to go with svn trunk mythtv, rev 19390
- Drop glass-wide
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 15:28:34 -0000 1.2
+++ .cvsignore 18 Dec 2008 02:23:41 -0000 1.3
@@ -1,3 +1,5 @@
glass-wide-20071107.tar.gz
myththemes-0.21.tar.bz2
themes-0.21.tar.bz2
+myththemes-0.22.tar.bz2
+themes-0.22.tar.bz2
Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/mythtv-themes.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-themes.spec 3 Aug 2008 15:28:34 -0000 1.1
+++ mythtv-themes.spec 18 Dec 2008 02:23:41 -0000 1.2
@@ -1,33 +1,81 @@
-Name: mythtv-themes
-Version: 0.21
-Release: 3
-Summary: Additional User Interface themes for MythTV
-Group: Applications/Multimedia
-License: GPLv2
-URL: http://www.mythtv.org/
-Source0: http://www.mythtv.org/mc/myththemes-%{version}.tar.bz2
-# created from svn rev 17859:
-# http://svn.mythtv.org/var/lib/svn/branches/release-0-21-fixes/themes
-Source1: themes-%{version}.tar.bz2
-# Upstream url dead, extracted from mythbuntu packages
-Source2: glass-wide-20071107.tar.gz
-Patch0: myththemes-0.21-svnfixes.patch
-BuildRequires: libmyth-devel = %{version}
-Requires: mythtv-themes = %{version}
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#
+# Specfile for building MythTV RPMs from a subversion checkout.
+#
+# by: Chris Petersen <rpm(a)forevermore.net>
+# Jarod Wilson <jarod(a)wilsonet.com>
+#
+# Modified/Extended from the great (non-svn based) work of:
+# Axel Thimm <Axel.Thimm(a)ATrpms.net>
+# and others; see changelog at bottom for details.
+#
+# The latest version of this file can be found at:
+#
+# http://www.mythtv.org/wiki/index.php/Mythtv-themes-svn-rpmbuild.spec
+#
+
+# The vendor name we should attribute the aforementioned entries to
+%define desktop_vendor RPMFusion
+
+# SVN Revision number and branch ID
+%define _svnrev r19390
+%define branch trunk
+
+#
+# Basic descriptive tags for this package:
+#
+Name: mythtv-themes
+Summary: Additional themes for mythtv's frontend
+URL: http://www.mythtv.org/
+Group: Applications/Multimedia
+License: GPLv2
+
+# Version/Release info
+Version: 0.22
+%if "%{branch}" == "trunk"
+Release: 0.1.svn.%{_svnrev}%{?dist}
+%else
+Release: 1%{?dist}
+%endif
+
+################################################################################
+
+# Tarballs created from svn "themes" and "myththemes" directories
+# Hopefully these will merge before 0.22 is released.
+Source0: http://www.mythtv.org/mc/myththemes-%{version}.tar.bz2
+Source1: themes-%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+
+################################################################################
+
+BuildRequires: libmyth-devel = %{version}
+BuildRequires: qt4-devel
+
+# Themes do require a frontend
+Requires: mythtv-frontend
+
+# And obselete a bunch of packages from when themes were packaged individually
+Obsoletes: mythtv-theme-MythCenter
+Obsoletes: mythtv-theme-Retro
+Obsoletes: mythtv-theme-Titivillus
+Obsoletes: mythtv-theme-isthmus
+
+################################################################################
%description
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv-docs package for more information.
-This package contains themes for the mythtv user interface.
+This package contains additional themes for the mythtv user interface.
+
+################################################################################
%prep
-%setup -q -c -a 1 -a 2
-cd myththemes-%{version}
-%patch0 -p1
-cd ..
+%setup -q -c -a 1
+
+################################################################################
%build
cd myththemes-%{version}
@@ -38,6 +86,8 @@
%configure
cd ..
+################################################################################
+
%install
rm -rf %{buildroot}
@@ -49,16 +99,25 @@
make install INSTALL_ROOT=%{buildroot}
cd ..
-cp -rp glass-wide %{buildroot}%{_datadir}/mythtv/themes/
+################################################################################
%clean
rm -rf %{buildroot}
+################################################################################
+
%files
%defattr(-,root,root,-)
%{_datadir}/mythtv/themes/*
%changelog
+* Wed Dec 17 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
+- Build svn trunk themes to go with svn trunk mythtv, rev 19390
+- Drop glass-wide
+
+* Sat Nov 01 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn
+- Clean and standardize package to match mythtv-svn spec
+
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-3
- rebuild
@@ -69,3 +128,4 @@
* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1
- Initial package
+
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 15:28:34 -0000 1.2
+++ sources 18 Dec 2008 02:23:41 -0000 1.3
@@ -1,3 +1,2 @@
-7cdec1649d3a94a8dbf96d129421cdac glass-wide-20071107.tar.gz
-9a569ab5561f348fdbf82cdc46a1df9b myththemes-0.21.tar.bz2
-8a036cbbb8cf29c5512931e1f6f5445f themes-0.21.tar.bz2
+6826ede7f96d4edc267821dafb4c8f01 myththemes-0.22.tar.bz2
+24212e61a3283c02ee6564f9a732d409 themes-0.22.tar.bz2
--- myththemes-0.21-svnfixes.patch DELETED ---
15 years, 5 months
rpms/mythtv/devel mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mythtv.spec, 1.15, 1.16 sources, 1.2, 1.3 mythplugins-0.21-svnfixes.patch, 1.5, NONE mythtv-0.21-enable-64bit-fast_cmov.patch, 1.1, NONE mythtv-0.21-svnfixes.patch, 1.6, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26131
Modified Files:
.cvsignore mythtv.spec sources
Added Files:
mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch
Removed Files:
mythplugins-0.21-svnfixes.patch
mythtv-0.21-enable-64bit-fast_cmov.patch
mythtv-0.21-svnfixes.patch
Log Message:
Bump mythtv build to subversion trunk. Here's hoping 0.22 gets released
by the time Fedora 11 does...
Now using the spec file that Chris Petersen and I merged together from
separate work we've both been doing over time. This spec is currently
more or less in sync with what's in mythtv's packaging/rpm svn dir.
* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
- MythTV svn trunk (pre-0.22), revision 19390
- Re-enable fast cmov on x86_64 by default
- Add BR: yasm-devel to enable yasm-specific improvements
mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch:
--- NEW FILE mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch ---
Index: mythtv/configure
===================================================================
--- mythtv/configure (revision 19358)
+++ mythtv/configure (working copy)
@@ -1652,6 +1652,7 @@
x86_64|amd64)
arch="x86_32"
enable fast_unaligned
+ enable fast_cmov
check_cc <<EOF && enable fast_64bit && arch="x86_64"
int test[sizeof(char*) - 7];
EOF
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 15:17:17 -0000 1.2
+++ .cvsignore 18 Dec 2008 02:15:41 -0000 1.3
@@ -2,3 +2,5 @@
mythtv-setup.png
mythplugins-0.21.tar.bz2
mythtv-0.21.tar.bz2
+mythtv-0.22.tar.bz2
+mythplugins-0.22.tar.bz2
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.15 -r 1.16 mythtv.spec
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mythtv.spec 12 Dec 2008 04:52:21 -0000 1.15
+++ mythtv.spec 18 Dec 2008 02:15:42 -0000 1.16
@@ -1,37 +1,140 @@
-# svn revision number
-%define _svnver r19344
-%define branch release-0-21-fixes
-# Nb: base 0.21 svn rev is r16468
-#define branch trunk
-
-# disabled options
-%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
-%define with_directfb %{?_with_directfb: 1} %{?!_with_directfb: 0}
-%define with_festival %{?_with_festival: 1} %{?!_with_festival: 0}
-%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0}
+#
+# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
+#
+# by: Chris Petersen <rpm(a)forevermore.net>
+# Jarod Wilson <jarod(a)wilsonet.com>
+#
+# Modified/Extended from the great (non-svn based) work of:
+# Axel Thimm <Axel.Thimm(a)ATrpms.net>
+# David Bussenschutt <buzz(a)oska.com>
+# and others; see changelog at bottom for details.
+#
+# The latest version of this file can be found at:
+#
+# http://www.mythtv.org/wiki/index.php/Mythtv-svn-rpmbuild.spec
+#
+# Note:
+#
+# This spec relies upon several files included in the RPMFusion mythtv
+# src.rpm file. Please install it into your build tree before trying to
+# build anything with this spec.
+#
+# Explanation of options:
+#
+# --with proc_opt Enable MythTV's optimized processor detection code
+# and override RPM's defaults.
+# --with debug Enable debug mode
+#
+# The following options are disabled by default. Use these options to enable:
+#
+# --with directfb Enable directfb support
+#
+# The following options are enabled by default. Use these options to disable:
+#
+# --without xvmcnvidia Disable NVidia XvMC support
+# --without perl Disable building of the perl bindings
+# --without python Disable building of the python bindings
+#
+# # All plugins get built by default, but you can disable them as you wish:
+#
+# --without mytharchive
+# --without mythbrowser
+# --without mythcontrols
+# --without mythflix
+# --without mythgallery
+# --without mythgame
+# --without mythmovies
+# --without mythmusic
+# --without mythnews
+# --without mythphone
+# --without mythvideo
+# --without mythweather
+# --without mythzoneminder
+# --without mythweb
+#
+# The following options are disabled by default. Use these options to enable:
+#
+# --with festival Enable festival/festvox support in MythPhone
+#
+
+################################################################################
+# A list of which applications we want to put into the desktop menu system
%define desktop_applications mythfrontend mythtv-setup
-%define desktop_vendor RPMFusion
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
+# The vendor name we should attribute the aforementioned entries to
+%define desktop_vendor RPMFusion
+
+# SVN Revision number and branch ID
+%define _svnrev r19390
+%define branch trunk
-Summary: A digital video recorder (DVR) application
-Name: mythtv
-Version: 0.21
+#
+# Basic descriptive tags for this package:
+#
+Name: mythtv
+Summary: A digital video recorder (DVR) application.
+URL: http://www.mythtv.org/
+Group: Applications/Multimedia
+
+# Version/Release info
+Version: 0.22
%if "%{branch}" == "trunk"
-Release: 0.2.%{_svnver}%{?dist}
+Release: 0.1.svn.%{_svnrev}%{?dist}
%else
-Release: 15%{?dist}
+Release: 1%{?dist}
%endif
-URL: http://www.mythtv.org/
+
# The primary license is GPLv2+, but bits are borrowed from a number of
# projects... For a breakdown of the licensing, see PACKAGE-LICENSING.
License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+)
-Group: Applications/Multimedia
-Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2
-Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
-Source10: PACKAGE-LICENSING
+
+################################################################################
+
+# Set "--with proc_opt" to let mythtv autodetect your CPU and run its
+# processor-specific optimizations. It seems to cause compile problems on many
+# systems (particularly x86_64), so it is classified by the MythTV developers
+# as "use at your own risk."
+%define with_proc_opt %{?_with_proc_opt: 1} %{!?_with_proc_opt: 0}
+
+# Set "--with debug" to enable MythTV debug compile mode
+%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
+
+# The following options are enabled by default. Use --without to disable them
+%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
+%define with_python %{?_without_python: 0} %{!?_without_python: 1}
+
+# The following options are disabled by default. Use --with to enable them
+%define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0}
+%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0}
+
+# All plugins get built by default, but you can disable them as you wish
+%define with_plugins %{?_without_plugins: 0} %{!?_without_plugins: 1}
+%define with_mytharchive %{?_without_mytharchive: 0} %{!?_without_mytharchive: 1}
+%define with_mythbrowser %{?_without_mythbrowser: 0} %{!?_without_mythbrowser: 1}
+%define with_mythcontrols %{?_without_mythcontrols: 0} %{!?_without_mythcontrols: 1}
+%define with_mythflix %{?_without_mythflix: 0} %{!?_without_mythflix: 1}
+%define with_mythgallery %{?_without_mythgallery: 0} %{!?_without_mythgallery: 1}
+%define with_mythgame %{?_without_mythgame: 0} %{!?_without_mythgame: 1}
+%define with_mythmovies %{?_without_mythmovies: 0} %{!?_without_mythmovies: 1}
+%define with_mythmusic %{?_without_mythmusic: 0} %{!?_without_mythmusic: 1}
+%define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews: 1}
+%define with_mythphone %{?_without_mythphone: 0} %{!?_without_mythphone: 1}
+%define with_mythvideo %{?_without_mythvideo: 0} %{!?_without_mythvideo: 1}
+%define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather: 1}
+%define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb: 1}
+%define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1}
+
+# The following plugin options are disabled by default. Use --with to enable them
+
+# MythPhone
+%define with_festival %{?_with_festival: 1} %{!?_with_festival: 0}
+
+################################################################################
+
+Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2
+Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
+Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig.in
Source102: mythbackend.init.in
Source103: mythbackend.logrotate.in
@@ -41,128 +144,200 @@
Source109: mythtv-setup.desktop
Source110: mysql.txt
Source401: mythweb.conf
-# Patches
-Patch100: mythtv-0.21-svnfixes.patch
-Patch101: mythtv-0.20-mythstreammenu.diff
-#Patch102: mythtv-0.21-fedora-settings.patch
-Patch200: mythplugins-0.21-svnfixes.patch
-#Patch201: mythplugins-0.21-fedora-settings.patch
-#
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: freetype-devel >= 2
-%if 0%{?fedora} >= 9
-BuildRequires: qt3-devel
-%else
-BuildRequires: qt-devel >= 3
+Patch0: mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+################################################################################
+# Python setup
+
+%if %{with_python}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')}
[...1704 lines suppressed...]
+%if %{with_mythgallery}
%files -n mythgallery
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythgallery/AUTHORS
@@ -911,7 +1445,9 @@
%{_libdir}/mythtv/plugins/libmythgallery.so
%{_datadir}/mythtv/i18n/mythgallery_*.qm
%{_localstatedir}/lib/pictures
+%endif
+%if %{with_mythgame}
%files -n mythgame
%defattr(-,root,root,-)
%dir %{_sysconfdir}/mythgame
@@ -921,14 +1457,39 @@
%exclude %{_datadir}/mythtv/games/xmame
%{_datadir}/mythtv/game_settings.xml
%{_datadir}/mythtv/i18n/mythgame_*.qm
-%exclude %{_datadir}/mame/screens
-#files -n mythgame-emulators
-#defattr(-,root,root,-)
-#{_datadir}/mythtv/games/xmame
-#{_datadir}/mame/screens
-#{_datadir}/mame/flyers
+%files -n mythgame-emulators
+%defattr(-,root,root,-)
+%{_datadir}/mythtv/games/xmame
+%{_datadir}/mame/screens
+%{_datadir}/mame/flyers
+%endif
+
+%if %{with_mythmovies}
+%files -n mythmovies
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mythmovies/COPYING
+%doc mythplugins-%{version}/mythmovies/README
+%doc mythplugins-%{version}/mythmovies/TODO
+%{_bindir}/ignyte
+%{_datadir}/mythtv/themes/default/movies-ui.xml
+%{_libdir}/mythtv/plugins/libmythmovies.so
+%endif
+
+%if %{with_mythmusic}
+%files -n mythmusic
+%defattr(-,root,root,-)
+%doc mythplugins-%{version}/mythmusic/AUTHORS
+%doc mythplugins-%{version}/mythmusic/COPYING
+%doc mythplugins-%{version}/mythmusic/README
+%{_libdir}/mythtv/plugins/libmythmusic.so
+%{_localstatedir}/lib/mythmusic
+%{_datadir}/mythtv/musicmenu.xml
+%{_datadir}/mythtv/music_settings.xml
+%{_datadir}/mythtv/i18n/mythmusic_*.qm
+%endif
+%if %{with_mythnews}
%files -n mythnews
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythnews/AUTHORS
@@ -937,16 +1498,9 @@
%{_libdir}/mythtv/plugins/libmythnews.so
%{_datadir}/mythtv/mythnews
%{_datadir}/mythtv/i18n/mythnews_*.qm
+%endif
-%files -n mythbrowser
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythbrowser/AUTHORS
-%doc mythplugins-%{version}/mythbrowser/COPYING
-%doc mythplugins-%{version}/mythbrowser/README
-%{_bindir}/mythbrowser
-%{_libdir}/mythtv/plugins/libmythbookmarkmanager.so
-%{_datadir}/mythtv/i18n/mythbrowser_*.qm
-
+%if %{with_mythphone}
%files -n mythphone
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythphone/AUTHORS
@@ -955,47 +1509,35 @@
%doc mythplugins-%{version}/mythphone/TODO
%{_libdir}/mythtv/plugins/libmythphone.so
%{_datadir}/mythtv/i18n/mythphone_*.qm
+%endif
-%files -n mythcontrols
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythcontrols/AUTHORS
-%doc mythplugins-%{version}/mythcontrols/COPYING
-%doc mythplugins-%{version}/mythcontrols/README
-%doc mythplugins-%{version}/mythcontrols/TODO
-%{_libdir}/mythtv/plugins/libmythcontrols.so
-%{_datadir}/mythtv/i18n/mythcontrols_*.qm
-
-%files -n mythflix
-%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mythflix/AUTHORS
-%doc mythplugins-%{version}/mythflix/COPYING
-%doc mythplugins-%{version}/mythflix/README
-%{_libdir}/mythtv/plugins/libmythflix.so
-%{_datadir}/mythtv/mythflix
-%{_datadir}/mythtv/i18n/mythflix_*.qm
-%{_datadir}/mythtv/i18n/mythflix_*.ts
-%{_datadir}/mythtv/netflix_menu.xml
-
-%files -n mytharchive
+%if %{with_mythvideo}
+%files -n mythvideo
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mytharchive/AUTHORS
-%doc mythplugins-%{version}/mytharchive/COPYING
-%doc mythplugins-%{version}/mytharchive/README
-%doc mythplugins-%{version}/mytharchive/TODO
-%{_bindir}/mytharchivehelper
-%{_libdir}/mythtv/plugins/libmytharchive.so
-%{_datadir}/mythtv/archiveformat.xml
-%{_datadir}/mythtv/archivemenu.xml
-%{_datadir}/mythtv/archiveutils.xml
-%{_datadir}/mythtv/mytharchive
-%{_datadir}/mythtv/i18n/mytharchive_*.qm
+%doc mythplugins-%{version}/mythvideo/COPYING
+%doc mythplugins-%{version}/mythvideo/README*
+%{_libdir}/mythtv/plugins/libmythvideo.so
+%{_datadir}/mythtv/mythvideo
+%{_datadir}/mythtv/i18n/mythvideo_*.qm
+%{_datadir}/mythtv/video_settings.xml
+%{_datadir}/mythtv/videomenu.xml
+%{_localstatedir}/lib/mythvideo
+%{_bindir}/mtd
+%endif
-%files -n mythzoneminder
+%if %{with_mythweather}
+%files -n mythweather
%defattr(-,root,root,-)
-%{_libdir}/mythtv/plugins/libmythzoneminder.so
-%{_datadir}/mythtv/zonemindermenu.xml
-%{_bindir}/mythzmserver
+%doc mythplugins-%{version}/mythweather/AUTHORS
+%doc mythplugins-%{version}/mythweather/COPYING
+%doc mythplugins-%{version}/mythweather/README
+%{_libdir}/mythtv/plugins/libmythweather.so
+%{_datadir}/mythtv/i18n/mythweather_*.qm
+%{_datadir}/mythtv/weather_settings.xml
+%{_datadir}/mythtv/mythweather
+%endif
+%if %{with_mythweb}
%files -n mythweb
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythweb/README
@@ -1003,26 +1545,33 @@
%defattr(-,apache,apache,0775)
%dir %{_datadir}/mythweb
%{_datadir}/mythweb/*
+%endif
-%files -n perl-MythTV
+%if %{with_mythzoneminder}
+%files -n mythzoneminder
%defattr(-,root,root,-)
-%{perl_vendorlib}/MythTV.pm
-%dir %{perl_vendorlib}/MythTV
-%{perl_vendorlib}/MythTV/*.pm
-%dir %{perl_vendorlib}/IO/Socket
-%dir %{perl_vendorlib}/IO/Socket/INET
-%{perl_vendorlib}/IO/Socket/INET/MythTV.pm
-%exclude %{perl_vendorarch}/auto/MythTV/.packlist
+%{_libdir}/mythtv/plugins/libmythzoneminder.so
+%{_datadir}/mythtv/zonemindermenu.xml
+%{_bindir}/mythzmserver
+%endif
-%files -n python-MythTV
-%defattr(-,root,root,-)
-%dir %{python_sitelib}/MythTV/
-%{python_sitelib}/MythTV/*
-%if 0%{?fedora} >= 9
-%{python_sitelib}/MythTV-*.egg-info
%endif
+################################################################################
+
%changelog
+* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
+- MythTV svn trunk (pre-0.22), revision 19390
+- Re-enable fast cmov on x86_64 by default
+- Add BR: yasm-devel to enable yasm-specific improvements
+
+* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn
+- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps
+- Major cleanup and porting from my personal spec (which was a combination
+ of works from atrpms and some of Jarod's earlier works).
+- Add a few more --with and --without options, including the ability to
+ disable specific mythplugins and/or all plugins.
+
* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
- Update to release-0-21-fixes patches (r19344)
- Includes critical fix for supporting use of FireWire cable
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 15:17:17 -0000 1.2
+++ sources 18 Dec 2008 02:15:42 -0000 1.3
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-6c08043227bef1384858deee12b5cdc3 mythplugins-0.21.tar.bz2
-49fc135e1cde90cd935c1229467fa37e mythtv-0.21.tar.bz2
+eaf125fe0679fb35dfdf2c207e50a73d mythtv-0.22.tar.bz2
+7b7df64d730e906f261327bff963685e mythplugins-0.22.tar.bz2
--- mythplugins-0.21-svnfixes.patch DELETED ---
--- mythtv-0.21-enable-64bit-fast_cmov.patch DELETED ---
--- mythtv-0.21-svnfixes.patch DELETED ---
15 years, 5 months
rpms/xine-lib-extras-freeworld/devel xine-lib-1.1.15-ffmpeg-api.patch, NONE, 1.1 xine-lib-extras-freeworld.spec, 1.12, 1.13 xine-lib-1.1.15-ffmpeg-bits_per_sample.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7609
Modified Files:
xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.15-ffmpeg-api.patch
Removed Files:
xine-lib-1.1.15-ffmpeg-bits_per_sample.patch
Log Message:
latest crack at updating for new ffmpeg-api
xine-lib-1.1.15-ffmpeg-api.patch:
--- NEW FILE xine-lib-1.1.15-ffmpeg-api.patch ---
diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_bits_per_sample xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_bits_per_sample 2008-07-15 18:13:03.000000000 -0500
+++ xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c 2008-12-17 14:32:17.000000000 -0600
@@ -269,7 +269,11 @@ static void ff_audio_decode_data (audio_
* bits/sample for some codecs (e.g. MS ADPCM) */
this->audio_bits = 16;
- this->context->bits_per_sample = this->audio_bits;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ this->context->bits_per_sample = this->audio_bits;
+#else
+ this->context->bits_per_coded_sample = this->audio_bits;
+#endif
this->context->sample_rate = this->audio_sample_rate;
this->context->channels = this->audio_channels;
this->context->codec_id = this->codec->id;
@@ -322,12 +326,24 @@ static void ff_audio_decode_data (audio_
if (!this->output_open) {
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
- avcodec_decode_audio (this->context,
+
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ avcodec_decode_audio (this->context,
(int16_t *)this->decode_buffer,
&decode_buffer_size,
&this->buf[0],
this->size);
- this->audio_bits = this->context->bits_per_sample;
+
+ this->audio_bits = this->context->bits_per_sample;
+#else
+ avcodec_decode_audio2 (this->context,
+ (int16_t *)this->decode_buffer,
+ &decode_buffer_size,
+ &this->buf[0],
+ this->size);
+
+ this->audio_bits = this->context->bits_per_coded_sample;
+#endif
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_bits_per_sample xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_bits_per_sample 2008-07-16 16:01:56.000000000 -0500
+++ xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c 2008-12-17 14:27:27.000000000 -0600
@@ -939,7 +939,12 @@ static void ff_handle_header_buffer (ff_
this->context->extradata_size);
}
- this->context->bits_per_sample = this->bih.biBitCount;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ this->context->bits_per_sample = this->bih.biBitCount;
+#else
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
+#endif
+
} else {
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xine-lib-extras-freeworld.spec 17 Dec 2008 19:26:02 -0000 1.12
+++ xine-lib-extras-freeworld.spec 17 Dec 2008 20:35:59 -0000 1.13
@@ -19,7 +19,7 @@
Patch0: xine-lib-1.1.3-optflags.patch
Patch6: xine-lib-1.1.1-deepbind-939.patch
-Patch100: xine-lib-1.1.15-ffmpeg-bits_per_sample.patch
+Patch100: xine-lib-1.1.15-ffmpeg-api.patch
BuildRequires: pkgconfig
BuildRequires: zlib-devel
@@ -27,7 +27,7 @@
%if 0%{?_with_external_ffmpeg:1}
BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
# HACKS to workaround missing deps in ffmpeg-devel
-BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel
+# BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel
%endif
BuildRequires: a52dec-devel
BuildRequires: libmad-devel
@@ -67,8 +67,8 @@
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
# Patch1 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
-# ffmpeg api: bits_per_sample->bits_per_coded_sample
-%patch100 -p1 -b .ffmpeg_bits_per_sample
+# ffmpeg api
+%patch100 -p1 -b .ffmpeg_api
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
--- xine-lib-1.1.15-ffmpeg-bits_per_sample.patch DELETED ---
15 years, 5 months
rpms/ffmpeg/devel .cvsignore, 1.7, 1.8 ffmpeg.spec, 1.12, 1.13 sources, 1.7, 1.8
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7149
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Wed Dec 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.57.20081217
- 20081217 snapshot
- fix pkgconfig files again (broken in 0.4.9-0.55.20081214)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 14 Dec 2008 19:03:09 -0000 1.7
+++ .cvsignore 17 Dec 2008 20:32:18 -0000 1.8
@@ -1 +1 @@
-ffmpeg-20081214.tar.bz2
+ffmpeg-20081217.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ffmpeg.spec 15 Dec 2008 18:01:01 -0000 1.12
+++ ffmpeg.spec 17 Dec 2008 20:32:18 -0000 1.13
@@ -1,12 +1,12 @@
# TODO: add make test to %%check section
-%define svn 20081214
+%define svn 20081217
%define faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.56.%{svn}%{?dist}
+Release: 0.57.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
@@ -245,6 +245,10 @@
%changelog
+* Wed Dec 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.57.20081217
+- 20081217 snapshot
+- fix pkgconfig files again (broken in 0.4.9-0.55.20081214)
+
* Mon Dec 15 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.56.20081214
- drop libdirac support for now
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 14 Dec 2008 19:03:09 -0000 1.7
+++ sources 17 Dec 2008 20:32:18 -0000 1.8
@@ -1 +1 @@
-eb90bfeda4ea39ff3c6b92806909a5be ffmpeg-20081214.tar.bz2
+ebcf1a05afa1014008447009521bbaa2 ffmpeg-20081217.tar.bz2
15 years, 5 months
