rpms/k3b-extras-freeworld/devel k3b-lavc52.patch, NONE, 1.1 k3b-extras-freeworld.spec, 1.7, 1.8
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25487
Modified Files:
k3b-extras-freeworld.spec
Added Files:
k3b-lavc52.patch
Log Message:
* Mon Dec 15 2008 Dominik Mierzejewski <rpm(a)greysector.net> - 1.0.5-5
- fix build with current ffmpeg
k3b-lavc52.patch:
--- NEW FILE k3b-lavc52.patch ---
diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
--- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 2008-12-15 20:47:09.000000000 +0100
+++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-12-15 21:23:34.000000000 +0100
@@ -194,7 +194,11 @@ QString K3bFFMpegFile::typeComment() con
return i18n("Windows Media v1");
case CODEC_ID_WMAV2:
return i18n("Windows Media v2");
+#if LIBAVCODEC_VERSION_MAJOR < 52
case CODEC_ID_MP3LAME:
+#else
+ case CODEC_ID_MP3:
+#endif
return i18n("MPEG 1 Layer III");
case CODEC_ID_AAC:
return i18n("Advanced Audio Coding (AAC)");
@@ -289,8 +293,10 @@ int K3bFFMpegFile::fillOutputBuffer()
#ifdef FFMPEG_BUILD_PRE_4629
int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
-#else
+#elif LIBAVCODEC_VERSION_MAJOR < 52
int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
+#else
+ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
#endif
(short*)d->outputBuffer, &d->outputBufferSize,
d->packetData, d->packetSize );
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- k3b-extras-freeworld.spec 17 Sep 2008 18:55:47 -0000 1.7
+++ k3b-extras-freeworld.spec 20 Dec 2008 19:31:47 -0000 1.8
@@ -8,7 +8,7 @@
Name: k3b-extras-freeworld
Version: 1.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Additional codec plugins for the k3b CD/DVD burning application
Group: Applications/Multimedia
@@ -18,6 +18,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
Patch1: k3b-1.0.5-ffmpeg.patch
+Patch2: k3b-lavc52.patch
ExcludeArch: s390 s390x
@@ -50,6 +51,7 @@
%if 0%{?ffmpeg:1}
%patch1 -p1 -b .ffmpeg
+%patch2 -p1 -b .lavc52
make -f admin/Makefile.common
%endif
@@ -119,6 +121,9 @@
%changelog
+* Mon Dec 15 2008 Dominik Mierzejewski <rpm(a)greysector.net> - 1.0.5-5
+- fix build with current ffmpeg
+
* Wed Sep 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.5-4
- better pkgconfig-based ffmpeg patch
- optimize configure
15 years, 4 months
rpms/xine-lib-extras-freeworld/devel xine-lib-1.1.15-ffmpeg-api.patch, 1.1, 1.2
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22308
Modified Files:
xine-lib-1.1.15-ffmpeg-api.patch
Log Message:
- remove whitespace changes from xine-lib-1.1.15-ffmpeg-api.patch
xine-lib-1.1.15-ffmpeg-api.patch:
Index: xine-lib-1.1.15-ffmpeg-api.patch
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-1.1.15-ffmpeg-api.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xine-lib-1.1.15-ffmpeg-api.patch 17 Dec 2008 20:35:59 -0000 1.1
+++ xine-lib-1.1.15-ffmpeg-api.patch 20 Dec 2008 18:36:51 -0000 1.2
@@ -1,60 +1,52 @@
-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
+diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api 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_api 2008-07-16 01:13:03.000000000 +0200
++++ xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c 2008-12-17 22:54:15.000000000 +0100
@@ -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;
+ 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_
+@@ -322,12 +326,21 @@ 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,
+ 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;
+ 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_
+diff -up xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api 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_api 2008-07-16 23:01:56.000000000 +0200
++++ xine-lib-1.1.15/src/combined/ffmpeg/ff_video_decoder.c 2008-12-17 22:54:56.000000000 +0100
+@@ -939,7 +939,11 @@ 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;
+ this->context->bits_per_sample = this->bih.biBitCount;
+#else
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
+#endif
-+
} else {
15 years, 4 months
rpms/devede/devel devede.spec,1.5,1.6
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21591
Modified Files:
devede.spec
Log Message:
* Sat Dec 20 2008 Andrea Musuruane <musuruan(a)gmail.com> 3.11b-3
- Rebuilt for python 2.6
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/devel/devede.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- devede.spec 19 Oct 2008 15:18:03 -0000 1.5
+++ devede.spec 20 Dec 2008 18:28:41 -0000 1.6
@@ -2,7 +2,7 @@
Name: devede
Version: 3.11b
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: DeVeDe is a program to create video DVDs and CDs (VCD, sVCD or CVD)
Group: Applications/Multimedia
@@ -98,6 +98,9 @@
%changelog
+* Sat Dec 20 2008 Andrea Musuruane <musuruan(a)gmail.com> 3.11b-3
+- Rebuilt for python 2.6
+
* Sun Oct 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.11b-2
- rebuilt
15 years, 4 months
rpms/xvidcore/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xvidcore.spec, 1.2, 1.3 xvidcore-rpm.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/xvidcore/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21200
Modified Files:
.cvsignore sources xvidcore.spec
Removed Files:
xvidcore-rpm.patch
Log Message:
* Sat Dec 20 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.1-1
- 1.2.1
- drop upstreamed compilation fix
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xvidcore/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 3 Dec 2008 00:04:05 -0000 1.3
+++ .cvsignore 20 Dec 2008 18:21:34 -0000 1.4
@@ -1 +1 @@
-xvidcore-1.2.0.tar.bz2
+xvidcore-1.2.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xvidcore/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 3 Dec 2008 00:04:05 -0000 1.3
+++ sources 20 Dec 2008 18:21:34 -0000 1.4
@@ -1 +1 @@
-07c31ebf7d4e7aa6fcd17e8e4a0d1aca xvidcore-1.2.0.tar.bz2
+8c4470ae8e5a104abedb39f6c70e2a40 xvidcore-1.2.1.tar.bz2
Index: xvidcore.spec
===================================================================
RCS file: /cvs/free/rpms/xvidcore/devel/xvidcore.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xvidcore.spec 3 Dec 2008 00:04:05 -0000 1.2
+++ xvidcore.spec 20 Dec 2008 18:21:34 -0000 1.3
@@ -1,5 +1,5 @@
Name: xvidcore
-Version: 1.2.0
+Version: 1.2.1
Release: 1%{?dist}
Summary: MPEG-4 Simple and Advanced Simple Profile codec
@@ -7,7 +7,6 @@
License: GPLv2+
URL: http://www.xvid.org/
Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
-Patch0: %{name}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch %{ix86} x86_64
@@ -35,7 +34,6 @@
%prep
%setup -q -n %{name}
-%patch0 -p1 -b .r
chmod -x examples/*.pl
f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f
# Yes, we want to see the build output.
@@ -83,6 +81,10 @@
%changelog
+* Sat Dec 20 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.1-1
+- 1.2.1
+- drop upstreamed compilation fix
+
* Wed Dec 03 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.0-1
- 1.2.0
- drop upstreamed noexec stack patch
--- xvidcore-rpm.patch DELETED ---
15 years, 4 months
rpms/x264/devel x264.spec,1.8,1.9
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18315
Modified Files:
x264.spec
Log Message:
* Sat Dec 20 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.22.20081213git9089d21
- rebuild against new gpac
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- x264.spec 14 Dec 2008 19:02:08 -0000 1.8
+++ x264.spec 20 Dec 2008 17:32:58 -0000 1.9
@@ -4,7 +4,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.21.%{snapshot}git%{git}%{?dist}
+Release: 0.22.%{snapshot}git%{git}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -131,6 +131,9 @@
%endif
%changelog
+* Sat Dec 20 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.22.20081213git9089d21
+- rebuild against new gpac
+
* Sat Dec 13 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.21.20081213git9089d21
- fix the libs split on x86
15 years, 4 months
rpms/cmus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/cmus/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsFY3804/rpms/cmus/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module cmus
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: cmus
# $Id: Makefile,v 1.1 2008/12/20 13:02:10 thl Exp $
NAME := cmus
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
15 years, 4 months
rpms/cmus Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/cmus
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsFY3804/rpms/cmus
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module cmus
--- NEW FILE Makefile ---
# Top level Makefile for module cmus
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
15 years, 4 months
rpms/cmus/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/cmus/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsFY3804/rpms/cmus/devel
Log Message:
Directory /cvs/free/rpms/cmus/devel added to the repository
15 years, 4 months
rpms/cmus - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/cmus
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsFY3804/rpms/cmus
Log Message:
Directory /cvs/free/rpms/cmus added to the repository
15 years, 4 months
rpms/broadcom-wl/F-9 broadcom-wl.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/broadcom-wl/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3010
Modified Files:
broadcom-wl.spec
Log Message:
* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-4
- ExcludeArch ppc, ppc64
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-9/broadcom-wl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl.spec 7 Nov 2008 21:38:56 -0000 1.1
+++ broadcom-wl.spec 20 Dec 2008 12:54:32 -0000 1.2
@@ -1,6 +1,6 @@
Name: broadcom-wl
Version: 5.10.27.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -14,6 +14,8 @@
Provides: wl-kmod-common = %{version}
Requires: wl-kmod >= %{version}
+ExcludeArch: ppc ppc64
+
%description
This package contains the license, readme and configuration files
for the Broadcom 802.11 Linux STA Driver for WiFi, a linux device
@@ -44,6 +46,9 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist
%changelog
+* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-4
+- ExcludeArch ppc, ppc64
+
* Fri Nov 07 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-3
- Updated README.txt file
- Cleaned up spec file
15 years, 4 months