rpms/mplayer/devel .cvsignore, 1.23, 1.24 mplayer-ffmpeg.patch, 1.3, 1.4 mplayer-nodvdcss.patch, 1.9, 1.10 mplayer.spec, 1.39, 1.40 sources, 1.24, 1.25 mplayer-pause.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10353
Modified Files:
.cvsignore mplayer-ffmpeg.patch mplayer-nodvdcss.patch
mplayer.spec sources
Removed Files:
mplayer-pause.patch
Log Message:
* Fri Sep 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.126.20110816svn
- 20110816 snapshot
- drop obsolete pause crash patch
- re-enable mp3lib decoder
- enable libmpg123 decoder
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 12 Apr 2011 16:33:03 -0000 1.23
+++ .cvsignore 23 Sep 2011 20:54:44 -0000 1.24
@@ -3,3 +3,4 @@
mplayer-export-2011-02-27.tar.bz2
mplayer-export-2011-04-04.tar.bz2
mplayer-export-2011-04-12.tar.bz2
+mplayer-export-2011-08-16.tar.bz2
mplayer-ffmpeg.patch:
Makefile | 2
configure | 4 -
ffmpeg/libavformat/riff.h | 41 ++++++++++++++++++
ffmpeg/libavutil/x86_cpu.h | 98 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 142 insertions(+), 3 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mplayer-ffmpeg.patch 12 Apr 2011 16:33:03 -0000 1.3
+++ mplayer-ffmpeg.patch 23 Sep 2011 20:54:45 -0000 1.4
@@ -1,17 +1,16 @@
-diff -up mplayer-export-2011-04-12/configure.ffmpeg mplayer-export-2011-04-12/configure
---- mplayer-export-2011-04-12/configure.ffmpeg 2011-04-12 17:18:33.000000000 +0200
-+++ mplayer-export-2011-04-12/configure 2011-04-12 17:18:33.000000000 +0200
-@@ -6888,7 +6888,8 @@ elif test "$ffmpeg_so" = auto ; then
+diff -up mplayer-export-2011-08-16/configure.ffmpeg mplayer-export-2011-08-16/configure
+--- mplayer-export-2011-08-16/configure.ffmpeg 2011-08-16 21:55:01.000000000 +0200
++++ mplayer-export-2011-08-16/configure 2011-08-16 21:56:38.000000000 +0200
+@@ -6792,7 +6792,7 @@ elif test "$ffmpeg_so" = auto ; then
inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil)
- _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
- header_check libavutil/avutil.h $inc_ffmpeg $_ld_tmp &&
-- extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes
-+ extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes &&
-+ extra_cflags="$extra_cflags $inc_ffmpeg"
- elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then
+ ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
+ header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp &&
+- extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes
++ extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes && extra_cflags="$extra_cflags $inc_ffmpeg"
+ elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil ; then
extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
-@@ -7593,7 +7594,7 @@ if test "$_gui" = yes ; then
+@@ -7481,7 +7481,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
@@ -20,9 +19,9 @@
die "The GUI requires libavcodec with PNG support (needs zlib)."
fi
test "$_freetype" = no && test "$_bitmap_font" = no &&
-diff -up mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h
---- mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h.ffmpeg 2011-04-12 17:18:33.000000000 +0200
-+++ mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h 2011-04-12 17:18:33.000000000 +0200
+diff -up mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h
+--- mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h.ffmpeg 2011-08-16 21:55:01.000000000 +0200
++++ mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h 2011-08-16 21:55:01.000000000 +0200
@@ -0,0 +1,41 @@
+/*
+ * RIFF codec tags
@@ -65,120 +64,9 @@
+extern const AVCodecTag ff_codec_wav_tags[];
+
+#endif /* AVFORMAT_RIFF_H */
-diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h
---- mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h.ffmpeg 2011-04-12 17:18:33.000000000 +0200
-+++ mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h 2011-04-12 17:18:33.000000000 +0200
-@@ -0,0 +1,47 @@
-+/*
-+ * copyright (c) 2007 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_AES_H
-+#define AVUTIL_AES_H
-+
-+#include <stdint.h>
-+
-+extern const int av_aes_size;
-+
-+struct AVAES;
-+
-+/**
-+ * Initialize an AVAES context.
-+ * @param key_bits 128, 192 or 256
-+ * @param decrypt 0 for encryption, 1 for decryption
-+ */
-+int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
-+
-+/**
-+ * Encrypt or decrypt a buffer using a previously initialized context.
-+ * @param count number of 16 byte blocks
-+ * @param dst destination array, can be equal to src
-+ * @param src source array, can be equal to dst
-+ * @param iv initialization vector for CBC mode, if NULL then ECB will be used
-+ * @param decrypt 0 for encryption, 1 for decryption
-+ */
-+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
-+
-+#endif /* AVUTIL_AES_H */
-diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h
---- mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h.ffmpeg 2011-04-12 17:18:33.000000000 +0200
-+++ mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h 2011-04-12 17:18:33.000000000 +0200
-@@ -0,0 +1,56 @@
-+/*
-+ * Copyright (C) 2007 Michael Niedermayer <michaelni(a)gmx.at>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVUTIL_SHA_H
-+#define AVUTIL_SHA_H
-+
-+#include <stdint.h>
-+
-+extern const int av_sha_size;
-+
-+struct AVSHA;
-+
-+/**
-+ * Initialize SHA-1 or SHA-2 hashing.
-+ *
-+ * @param context pointer to the function context (of size av_sha_size)
-+ * @param bits number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits)
-+ * @return zero if initialization succeeded, -1 otherwise
-+ */
-+int av_sha_init(struct AVSHA* context, int bits);
-+
-+/**
-+ * Update hash value.
-+ *
-+ * @param context hash function context
-+ * @param data input data to update hash with
-+ * @param len input data length
-+ */
-+void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len);
-+
-+/**
-+ * Finish hashing and output digest value.
-+ *
-+ * @param context hash function context
-+ * @param digest buffer where output digest value is stored
-+ */
-+void av_sha_final(struct AVSHA* context, uint8_t *digest);
-+
-+#endif /* AVUTIL_SHA_H */
-diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-04-12 17:18:33.000000000 +0200
-+++ mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h 2011-04-12 17:18:33.000000000 +0200
+diff -up mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h
+--- mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-08-16 21:55:01.000000000 +0200
++++ mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h 2011-08-16 21:55:01.000000000 +0200
@@ -0,0 +1,98 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
@@ -278,10 +166,10 @@
+#endif
+
+#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2011-04-12/Makefile.ffmpeg mplayer-export-2011-04-12/Makefile
---- mplayer-export-2011-04-12/Makefile.ffmpeg 2011-04-12 17:18:33.000000000 +0200
-+++ mplayer-export-2011-04-12/Makefile 2011-04-12 17:18:33.000000000 +0200
-@@ -809,7 +809,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up mplayer-export-2011-08-16/Makefile.ffmpeg mplayer-export-2011-08-16/Makefile
+--- mplayer-export-2011-08-16/Makefile.ffmpeg 2011-08-16 21:55:01.000000000 +0200
++++ mplayer-export-2011-08-16/Makefile 2011-08-16 21:55:01.000000000 +0200
+@@ -779,7 +779,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
mplayer-nodvdcss.patch:
Makefile | 7 -------
configure | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
Index: mplayer-nodvdcss.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-nodvdcss.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mplayer-nodvdcss.patch 10 Jan 2011 18:48:43 -0000 1.9
+++ mplayer-nodvdcss.patch 23 Sep 2011 20:54:45 -0000 1.10
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2011-01-10/configure.nodvdcss mplayer-export-2011-01-10/configure
---- mplayer-export-2011-01-10/configure.nodvdcss 2011-01-06 13:42:59.000000000 +0100
-+++ mplayer-export-2011-01-10/configure 2011-01-10 19:02:59.000000000 +0100
-@@ -689,7 +689,7 @@ _dvdnavconfig=dvdnav-config
+diff -up mplayer-export-2011-08-16/configure.nodvdcss mplayer-export-2011-08-16/configure
+--- mplayer-export-2011-08-16/configure.nodvdcss 2011-08-11 19:45:43.000000000 +0200
++++ mplayer-export-2011-08-16/configure 2011-08-16 21:53:23.000000000 +0200
+@@ -731,7 +731,7 @@ _dvdnavconfig=dvdnav-config
_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
@@ -10,10 +10,10 @@
_xanim=auto
_real=auto
_live=auto
-diff -up mplayer-export-2011-01-10/Makefile.nodvdcss mplayer-export-2011-01-10/Makefile
---- mplayer-export-2011-01-10/Makefile.nodvdcss 2011-01-10 19:02:59.000000000 +0100
-+++ mplayer-export-2011-01-10/Makefile 2011-01-10 19:03:25.000000000 +0100
-@@ -111,11 +111,6 @@ SRCS_COMMON-$(LIBDCA) +=
+diff -up mplayer-export-2011-08-16/Makefile.nodvdcss mplayer-export-2011-08-16/Makefile
+--- mplayer-export-2011-08-16/Makefile.nodvdcss 2011-08-16 21:53:23.000000000 +0200
++++ mplayer-export-2011-08-16/Makefile 2011-08-16 21:53:55.000000000 +0200
+@@ -112,11 +112,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
@@ -25,15 +25,15 @@
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
-@@ -742,7 +737,6 @@ DIRS = . \
- libaf \
- libao2 \
+@@ -741,7 +736,6 @@ DIRS = . \
+
+ ALL_DIRS = $(DIRS) \
libass \
- libdvdcss \
libdvdnav \
libdvdnav/vm \
libdvdread4 \
-@@ -858,7 +852,6 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma
+@@ -830,7 +824,6 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma
gui/%: CFLAGS += -Wno-strict-prototypes
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mplayer.spec 14 Jul 2011 22:05:35 -0000 1.39
+++ mplayer.spec 23 Sep 2011 20:54:45 -0000 1.40
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20110412svn
+%define pre 20110816svn
%define svn 1
-%define svnbuild 2011-04-12
+%define svnbuild 2011-08-16
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.125.%{pre}%{?dist}
+Release: 0.126.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -32,8 +32,6 @@
Patch14: %{name}-nodvdcss.patch
# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
-# Upstream fix for http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1904
-Patch19: %{name}-pause.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -46,7 +44,7 @@
BuildRequires: em8300-devel
BuildRequires: enca-devel
BuildRequires: faad2-devel >= %{faad2min}
-BuildRequires: ffmpeg-devel >= 0.6.90-0.1.rc0
+BuildRequires: ffmpeg-devel >= 0.7.3
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.9
BuildRequires: fribidi-devel
@@ -70,6 +68,7 @@
BuildRequires: libjpeg-devel
BuildRequires: libmpcdec-devel
BuildRequires: libmpeg2-devel
+BuildRequires: libmpg123-devel
BuildRequires: librtmp-devel
BuildRequires: libtheora-devel
BuildRequires: libvdpau-devel
@@ -184,7 +183,6 @@
--language=all \\\
\\\
--enable-joystick \\\
- --enable-largefiles \\\
--enable-lirc \\\
--enable-menu \\\
--enable-radio \\\
@@ -219,7 +217,6 @@
%{!?_with_esound:--disable-esd} \\\
%{!?_with_jack:--disable-jack} \\\
%{!?_with_openal:--disable-openal} \\\
- --disable-mp3lib \\\
%prep
@@ -232,7 +229,6 @@
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
-%patch19 -p1 -b .pause
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -304,9 +300,9 @@
ln -s Blue $RPM_BUILD_ROOT%{_datadir}/mplayer/skins/default
# Icons
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -pm 644 etc/mplayer.xpm \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+install -pm 644 etc/mplayer.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
# Desktop file
desktop-file-install \
@@ -360,7 +356,7 @@
%defattr(-, root, root, -)
%{_bindir}/gmplayer
%{_datadir}/applications/*mplayer.desktop
-%{_datadir}/icons/hicolor/32x32/apps/mplayer.xpm
+%{_datadir}/icons/hicolor/48x48/apps/mplayer.png
%{_datadir}/mplayer/skins/
%files -n mencoder
@@ -405,6 +401,12 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Fri Sep 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.126.20110816svn
+- 20110816 snapshot
+- drop obsolete pause crash patch
+- re-enable mp3lib decoder
+- enable libmpg123 decoder
+
* Fri Jul 15 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.125.20110412svn
- Rebuilt for x264 ABI 115
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 12 Apr 2011 16:33:04 -0000 1.24
+++ sources 23 Sep 2011 20:54:46 -0000 1.25
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-8d56ef3c6200b81e1b9b6824afb2fba2 mplayer-export-2011-04-12.tar.bz2
+a63483caa8a603ccefbb8e29bf94b4c7 mplayer-export-2011-08-16.tar.bz2
--- mplayer-pause.patch DELETED ---
12 years, 7 months
rpms/ffmpeg/F-14 ffmpeg.spec,1.39,1.40
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8657
Modified Files:
ffmpeg.spec
Log Message:
- fix FFmpeg name spelling
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/ffmpeg.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ffmpeg.spec 23 Sep 2011 20:41:28 -0000 1.39
+++ ffmpeg.spec 23 Sep 2011 20:42:14 -0000 1.40
@@ -47,7 +47,7 @@
%endif
%description
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -57,7 +57,7 @@
Group: System Environment/Libraries
%description libs
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -70,7 +70,7 @@
Requires: pkgconfig
%description devel
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -243,6 +243,7 @@
- enable FreeType support
- fix build with old celt
- Changelog seems to be missing from the tarball, don't include it for now
+- fix FFmpeg name spelling
- fix build --with ffmpegsuffix
* Wed May 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.3-1
12 years, 7 months
rpms/ffmpeg/F-14 .cvsignore, 1.20, 1.21 ffmpeg.spec, 1.38, 1.39 sources, 1.21, 1.22
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8576
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
- bump to 0.7.5
- fix build --with ffmpegsuffix
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 14 Aug 2011 11:36:13 -0000 1.20
+++ .cvsignore 23 Sep 2011 20:41:28 -0000 1.21
@@ -1 +1 @@
-ffmpeg-0.7.3.tar.bz2
+ffmpeg-0.7.5.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/ffmpeg.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ffmpeg.spec 14 Aug 2011 11:36:13 -0000 1.38
+++ ffmpeg.spec 23 Sep 2011 20:41:28 -0000 1.39
@@ -4,7 +4,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.7.3
+Version: 0.7.5
Release: 1%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -178,8 +178,8 @@
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
popd
-install -pm755 qt-faststart $RPM_BUILD_ROOT%{_bindir}
%if 0%{!?ffmpegsuffix:1}
+install -pm755 qt-faststart $RPM_BUILD_ROOT%{_bindir}
pushd simd
%ifarch sparc sparc64
make install DESTDIR=$RPM_BUILD_ROOT
@@ -199,7 +199,6 @@
%files
%defattr(-,root,root,-)
%doc COPYING.* CREDITS README doc/ffserver.conf
-#doc Changelog
%{_bindir}/ffmpeg
%{_bindir}/ffplay
%{_bindir}/ffprobe
@@ -235,8 +234,8 @@
%changelog
-* Fri Aug 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.7.3
-- update to 0.7.3
+* Fri Sep 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.7.5-1
+- update to 0.7.5
- build PIC objects on PPC (bug #1457)
- restore mistakenly dropped qt-faststart tool
- enable CELT decoding via libcelt
@@ -244,6 +243,7 @@
- enable FreeType support
- fix build with old celt
- Changelog seems to be missing from the tarball, don't include it for now
+- fix build --with ffmpegsuffix
* Wed May 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.3-1
- Update to 0.6.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 14 Aug 2011 11:36:13 -0000 1.21
+++ sources 23 Sep 2011 20:41:28 -0000 1.22
@@ -1 +1 @@
-c9e455dc8f555028d551556798347abf ffmpeg-0.7.3.tar.bz2
+4e85037d1a94ff8cbcf5a0a133181a48 ffmpeg-0.7.5.tar.bz2
12 years, 7 months
rpms/ffmpeg/F-15 .cvsignore, 1.24, 1.25 ffmpeg.spec, 1.47, 1.48 sources, 1.24, 1.25
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8498
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
- add forgotten sources and changelog entries
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 25 Jun 2011 12:09:55 -0000 1.24
+++ .cvsignore 23 Sep 2011 20:40:54 -0000 1.25
@@ -1 +1 @@
-ffmpeg-oldabi-20110612.tar.bz2
+ffmpeg-0.7.5.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/ffmpeg.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ffmpeg.spec 23 Sep 2011 20:26:37 -0000 1.47
+++ ffmpeg.spec 23 Sep 2011 20:40:54 -0000 1.48
@@ -257,7 +257,9 @@
- support AMR WB encoding via libvo-amrwbenc (optional)
- enable FreeType support
- fix build with old celt
+- Changelog seems to be missing from the tarball, don't include it for now
- fix FFmpeg name spelling
+- fix build --with ffmpegsuffix
* Fri Jul 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.3.20110612git
- Add XvMC in ffmpeg
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 25 Jun 2011 12:09:55 -0000 1.24
+++ sources 23 Sep 2011 20:40:54 -0000 1.25
@@ -1 +1 @@
-881aca23a4e13a7eb3207d98a1e38643 ffmpeg-oldabi-20110612.tar.bz2
+4e85037d1a94ff8cbcf5a0a133181a48 ffmpeg-0.7.5.tar.bz2
12 years, 7 months
rpms/ffmpeg/F-15 ffmpeg.spec,1.46,1.47
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6078
Modified Files:
ffmpeg.spec
Log Message:
- fix FFmpeg name spelling
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/ffmpeg.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ffmpeg.spec 23 Sep 2011 18:49:47 -0000 1.46
+++ ffmpeg.spec 23 Sep 2011 20:26:37 -0000 1.47
@@ -56,7 +56,7 @@
%endif
%description
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -66,7 +66,7 @@
Group: System Environment/Libraries
%description libs
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -79,7 +79,7 @@
Requires: pkgconfig
%description devel
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -257,6 +257,7 @@
- support AMR WB encoding via libvo-amrwbenc (optional)
- enable FreeType support
- fix build with old celt
+- fix FFmpeg name spelling
* Fri Jul 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.3.20110612git
- Add XvMC in ffmpeg
12 years, 7 months
rpms/ffmpeg/devel ffmpeg.spec,1.48,1.49
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3958
Modified Files:
ffmpeg.spec
Log Message:
- fix build with ffmpegsuffix
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ffmpeg.spec 23 Sep 2011 17:57:54 -0000 1.48
+++ ffmpeg.spec 23 Sep 2011 20:10:04 -0000 1.49
@@ -188,9 +188,9 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
-install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
%if 0%{!?ffmpegsuffix:1}
+install -pm755 generic/tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
pushd simd
%ifarch sparc sparc64
make install DESTDIR=$RPM_BUILD_ROOT
12 years, 7 months
rpms/x264/F-15 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 x264-nover.patch, 1.3, 1.4 x264-snapshot.sh, 1.2, 1.3 x264.spec, 1.25, 1.26 x264-nostrip.patch, 1.1, NONE x264-shared.patch, 1.5, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32399
Modified Files:
.cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec
Removed Files:
x264-nostrip.patch x264-shared.patch
Log Message:
* Fri Aug 12 2011 Dominik Mierzejewski <rpm(a)greysector.net> - 0.0.0-0.30.20110620
- Update to 20110620 stable branch (ABI 115)
- Convert x264-snapshot to git (based on ffmpeg script).
- New Build Conditionals --with ffmpegsource libavformat
- Remove shared and strip patches - undeeded anymore
- Remove uneeded convertion of AUTHORS
- fix snapshot script to include version.h properly
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/F-15/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 27 Feb 2011 22:52:17 -0000 1.16
+++ .cvsignore 23 Sep 2011 19:39:14 -0000 1.17
@@ -1 +1 @@
-x264-20110227.tar.bz2
+x264-stable-20110620.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/F-15/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 27 Feb 2011 22:52:17 -0000 1.16
+++ sources 23 Sep 2011 19:39:14 -0000 1.17
@@ -1 +1 @@
-784318733e4301d7c49c1317cdfe6baf x264-20110227.tar.bz2
+b048113f0148b2325fd35b9cd4d32674 x264-stable-20110620.tar.bz2
x264-nover.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: x264-nover.patch
===================================================================
RCS file: /cvs/free/rpms/x264/F-15/x264-nover.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x264-nover.patch 19 Jun 2010 22:17:30 -0000 1.3
+++ x264-nover.patch 23 Sep 2011 19:39:14 -0000 1.4
@@ -1,9 +1,9 @@
-diff -up x264-20100620/configure.nover x264-20100620/configure
---- x264-20100620/configure.nover 2010-06-20 00:07:41.000000000 +0200
-+++ x264-20100620/configure 2010-06-20 00:11:53.000000000 +0200
-@@ -689,7 +689,7 @@ if [ "$shared" = "yes" ]; then
- echo 'default: $(SONAME)' >> config.mak
- fi
+diff -up x264-stable-20110620/configure.nover x264-stable-20110620/configure
+--- x264-stable-20110620/configure.nover 2011-08-12 02:04:14.000000000 +0200
++++ x264-stable-20110620/configure 2011-08-12 02:07:28.000000000 +0200
+@@ -1038,7 +1038,7 @@ fi
+ echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak
+ echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
-./version.sh >> config.h
+cat version.h >> config.h
Index: x264-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/x264/F-15/x264-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x264-snapshot.sh 27 Feb 2011 22:52:17 -0000 1.2
+++ x264-snapshot.sh 23 Sep 2011 19:39:14 -0000 1.3
@@ -12,13 +12,18 @@
unset CDPATH
pwd=$(pwd)
-git=$(date +%Y%m%d)
+date=20110620
+package=x264
+branch=stable
+commit=2809cb6ce63817a58c5639642fe05bc50747e126
pushd "$tmp"
-git clone git://git.videolan.org/x264.git x264-$git
-pushd x264-$git
+git clone git://git.videolan.org/${package}.git -b ${branch}
+cd ${package}
+git checkout ${commit}
+git checkout -b rpmfusion
./version.sh > version.h
-find . -type d -name .git -print0 | xargs -0r rm -rf
-popd
-tar jcf "$pwd"/x264-$git.tar.bz2 x264-$git
+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
popd >/dev/null
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-15/x264.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- x264.spec 10 Mar 2011 22:34:46 -0000 1.25
+++ x264.spec 23 Sep 2011 19:39:14 -0000 1.26
@@ -1,22 +1,21 @@
-%global snapshot 20110227
+%global snapshot 20110620
+%global branch stable
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.29.%{snapshot}%{?dist}
+Release: 0.30.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
-Source0: %{name}-%{snapshot}.tar.bz2
+Source0: %{name}-%{branch}-%{snapshot}.tar.bz2
Source1: x264-snapshot.sh
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
-# link with shared libx264
-Patch1: x264-shared.patch
-# don't strip if configured with --enable-debug
-Patch2: x264-nostrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
%{!?_without_gpac:BuildRequires: gpac-devel-static}
+%{?_with_libavformat:BuildRequires: ffmpeg-devel}
+%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel}
%ifarch x86_64 i686
BuildRequires: yasm
@@ -57,19 +56,17 @@
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
%{?_with_visualize:--enable-visualize} \\\
+ %{!?_with_libavformat:--disable-lavf} \\\
+ %{!?_with_ffmpegsource:--disable-ffms} \\\
--enable-debug \\\
--enable-shared \\\
+ --system-libx264 \\\
--enable-pic
%prep
-%setup -q -n %{name}-%{snapshot}
+%setup -q -n %{name}-%{branch}-%{snapshot}
%patch0 -p1 -b .nover
-%patch1 -p1 -b .shared
-%patch2 -p1 -b .nostrip
-# AUTHORS file is in iso-8859-1
-iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
-mv -f AUTHORS.utf8 AUTHORS
%ifarch i686
mkdir simd
cp -a `ls -1|grep -v simd` simd/
@@ -104,6 +101,10 @@
popd
%endif
+#Fix timestamp on x264 generated headers
+touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
+
+
%clean
%{__rm} -rf %{buildroot}
@@ -121,9 +122,7 @@
%{_libdir}/libx264.so.*
%ifarch i686
%{_libdir}/sse2/libx264.so.*
-%exclude %{_libdir}/sse2/libx264.a
%endif
-%exclude %{_libdir}/libx264.a
%files devel
%defattr(644, root, root, 0755)
@@ -137,6 +136,14 @@
%endif
%changelog
+* Fri Aug 12 2011 Dominik Mierzejewski <rpm(a)greysector.net> - 0.0.0-0.30.20110620
+- Update to 20110620 stable branch (ABI 115)
+- Convert x264-snapshot to git (based on ffmpeg script).
+- New Build Conditionals --with ffmpegsource libavformat
+- Remove shared and strip patches - undeeded anymore
+- Remove uneeded convertion of AUTHORS
+- fix snapshot script to include version.h properly
+
* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110227
- 20110227 snapshot (ABI bump)
--- x264-nostrip.patch DELETED ---
--- x264-shared.patch DELETED ---
12 years, 7 months
rpms/avidemux/F-14 avidemux.spec,1.46,1.47
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29347
Modified Files:
avidemux.spec
Log Message:
* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
- Obsolete useless devel subpackage which has multilib issues.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- avidemux.spec 8 Aug 2011 18:59:59 -0000 1.46
+++ avidemux.spec 23 Sep 2011 19:17:59 -0000 1.47
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.5
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -45,6 +45,7 @@
Requires: %{name}-cli = %{version}-%{release}
Requires: %{name}-gui = %{version}
Requires: %{name}-plugins = %{version}
+Obsoletes: %{name}-devel
# Compiling
BuildRequires: cmake
@@ -149,14 +150,6 @@
%description qt
This package contains the Qt graphical interface for %{name}.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-This package contains files required to develop with or extend %{name}.
-
%prep
%setup -q -n %{name}_%{version}
@@ -227,16 +220,11 @@
%install
-rm -rf %{buildroot}
-
make -C build install DESTDIR=%{buildroot}
make -C build_plugins install DESTDIR=%{buildroot}
-# Install the build configuration for devel package
-install -d -m755 %{buildroot}%{_includedir}
-install -m644 build/config/ADM_coreConfig.h %{buildroot}%{_includedir}/ADM_coreConfig.h
install -d -m755 %{buildroot}%{_datadir}/pixmaps
-install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+install -pm0644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
# Find and remove all la files
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@@ -266,9 +254,6 @@
# Gettext-style translations
%find_lang %{name}
-%clean
-rm -rf %{buildroot}
-
%post libs -p /sbin/ldconfig
@@ -291,14 +276,12 @@
%exclude %{_libdir}/ADM_plugins/videoFilter/*gtk.so
%exclude %{_libdir}/ADM_plugins/videoFilter/*qt4.so
-
%files cli
%{_bindir}/avidemux2_cli
%{_libdir}/libADM_UICli.so
%{_libdir}/libADM_render_cli.so
%{_libdir}/ADM_plugins/videoFilter/*cli.so
-
%files gtk -f %{name}.lang
%{_bindir}/avidemux2_gtk
%{_libdir}/libADM_UIGtk.so
@@ -318,11 +301,11 @@
%{_datadir}/applications/*qt*.desktop
%dir %{_datadir}/%{name}/i18n
-%files devel
-%{_includedir}/ADM_coreConfig.h
-
%changelog
+* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
+- Obsolete useless devel subpackage which has multilib issues.
+
* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
- Moved UI specific libraries and plugins to their respective sub-package to
prevent unneeded dependencies from being installed.
12 years, 7 months
rpms/avidemux/F-15 avidemux.spec,1.55,1.56
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29185
Modified Files:
avidemux.spec
Log Message:
* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
- Obsolete useless devel subpackage which has multilib issues.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-15/avidemux.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- avidemux.spec 8 Aug 2011 19:01:17 -0000 1.55
+++ avidemux.spec 23 Sep 2011 19:17:00 -0000 1.56
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.5
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -45,6 +45,7 @@
Requires: %{name}-cli = %{version}-%{release}
Requires: %{name}-gui = %{version}
Requires: %{name}-plugins = %{version}
+Obsoletes: %{name}-devel
# Compiling
BuildRequires: cmake
@@ -149,14 +150,6 @@
%description qt
This package contains the Qt graphical interface for %{name}.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-This package contains files required to develop with or extend %{name}.
-
%prep
%setup -q -n %{name}_%{version}
@@ -227,16 +220,11 @@
%install
-rm -rf %{buildroot}
-
make -C build install DESTDIR=%{buildroot}
make -C build_plugins install DESTDIR=%{buildroot}
-# Install the build configuration for devel package
-install -d -m755 %{buildroot}%{_includedir}
-install -m644 build/config/ADM_coreConfig.h %{buildroot}%{_includedir}/ADM_coreConfig.h
install -d -m755 %{buildroot}%{_datadir}/pixmaps
-install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+install -pm0644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
# Find and remove all la files
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@@ -266,9 +254,6 @@
# Gettext-style translations
%find_lang %{name}
-%clean
-rm -rf %{buildroot}
-
%post libs -p /sbin/ldconfig
@@ -291,14 +276,12 @@
%exclude %{_libdir}/ADM_plugins/videoFilter/*gtk.so
%exclude %{_libdir}/ADM_plugins/videoFilter/*qt4.so
-
%files cli
%{_bindir}/avidemux2_cli
%{_libdir}/libADM_UICli.so
%{_libdir}/libADM_render_cli.so
%{_libdir}/ADM_plugins/videoFilter/*cli.so
-
%files gtk -f %{name}.lang
%{_bindir}/avidemux2_gtk
%{_libdir}/libADM_UIGtk.so
@@ -318,11 +301,11 @@
%{_datadir}/applications/*qt*.desktop
%dir %{_datadir}/%{name}/i18n
-%files devel
-%{_includedir}/ADM_coreConfig.h
-
%changelog
+* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
+- Obsolete useless devel subpackage which has multilib issues.
+
* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
- Moved UI specific libraries and plugins to their respective sub-package to
prevent unneeded dependencies from being installed.
12 years, 7 months
rpms/ffmpeg/F-15 ffmpeg-celt.patch,NONE,1.1 ffmpeg.spec,1.45,1.46
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25685
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-celt.patch
Log Message:
* Fri Sep 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.7.5-1
- update to 0.7.5
- build PIC objects on PPC (bug #1457)
- enable CELT decoding via libcelt
- support AMR WB encoding via libvo-amrwbenc (optional)
- enable FreeType support
- fix build with old celt
ffmpeg-celt.patch:
libcelt_dec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE ffmpeg-celt.patch ---
diff -up ffmpeg-0.7.3/libavcodec/libcelt_dec.c.celt ffmpeg-0.7.3/libavcodec/libcelt_dec.c
--- ffmpeg-0.7.3/libavcodec/libcelt_dec.c.celt 2011-08-10 14:15:51.000000000 +0200
+++ ffmpeg-0.7.3/libavcodec/libcelt_dec.c 2011-08-12 02:31:20.000000000 +0200
@@ -52,7 +52,7 @@ static int ff_celt_error_to_averror(int
static int ff_celt_bitstream_version_hack(CELTMode *mode)
{
CELTHeader header = { .version_id = 0 };
- celt_header_init(&header, mode, 960, 2);
+ celt_header_init(&header, mode, 2);
return header.version_id;
}
@@ -68,7 +68,7 @@ static av_cold int libcelt_dec_init(AVCo
celt->mode = celt_mode_create(c->sample_rate, c->frame_size, &err);
if (!celt->mode)
return ff_celt_error_to_averror(err);
- celt->dec = celt_decoder_create_custom(celt->mode, c->channels, &err);
+ celt->dec = celt_decoder_create(celt->mode, c->channels, &err);
if (!celt->dec) {
celt_mode_destroy(celt->mode);
return ff_celt_error_to_averror(err);
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-15/ffmpeg.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ffmpeg.spec 1 Jul 2011 21:06:15 -0000 1.45
+++ ffmpeg.spec 23 Sep 2011 18:49:47 -0000 1.46
@@ -1,13 +1,13 @@
# TODO: add make test to %%check section
-%global branch oldabi-
-%global date 20110612
-#global rel rc1
+#global branch oldabi-
+#global date 20110612
+%global rel %nil
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.7
-Release: 0.3.%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 0.7.5
+Release: 1%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -18,14 +18,17 @@
%if 0%{?date}
Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
-Source0: http://ffmpeg.org/releases/ffmpeg-%{version}-%{rel}.tar.bz2
+Source0: http://ffmpeg.org/releases/ffmpeg-%{version}%{rel}.tar.bz2
%endif
Source1: ffmpeg-snapshot-oldabi.sh
+Patch0: ffmpeg-celt.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: bzip2-devel
+BuildRequires: celt-devel
BuildRequires: dirac-devel
%{?_with_faac:BuildRequires: faac-devel}
+BuildRequires: freetype-devel
BuildRequires: gsm-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
@@ -38,14 +41,14 @@
%ifarch %{ix86} x86_64
BuildRequires: libXvMC-devel
%endif
-%{?_with_amr:BuildRequires: opencore-amr-devel}
+%{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
BuildRequires: speex-devel
BuildRequires: subversion
BuildRequires: texi2html
-%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.29}
+%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.30}
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -92,11 +95,14 @@
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
- %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
+ --extra-version=rpmfusion \\\
+ %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
+ --enable-libcelt \\\
--enable-libdc1394 \\\
--enable-libdirac \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
+ --enable-libfreetype \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
--enable-libopenjpeg \\\
@@ -124,8 +130,9 @@
%setup -q -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
-%setup -q -n ffmpeg-%{version}-%{rel}
+%setup -q -n ffmpeg-%{version}%{rel}
%endif
+%patch0 -p1 -b .celt
%build
mkdir generic
@@ -163,6 +170,8 @@
make alltools
popd
+gcc -o qt-faststart $RPM_OPT_FLAGS tools/qt-faststart.c
+
%if 0%{!?ffmpegsuffix:1}
mkdir simd
pushd simd
@@ -184,9 +193,9 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
-install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
%if 0%{!?ffmpegsuffix:1}
+install -pm755 qt-faststart $RPM_BUILD_ROOT%{_bindir}
pushd simd
%ifarch sparc sparc64
make install DESTDIR=$RPM_BUILD_ROOT
@@ -205,7 +214,7 @@
%if 0%{!?ffmpegsuffix:1}
%files
%defattr(-,root,root,-)
-%doc COPYING.* CREDITS Changelog README doc/ffserver.conf
+%doc COPYING.* CREDITS README doc/ffserver.conf
%{_bindir}/ffmpeg
%{_bindir}/ffplay
%{_bindir}/ffprobe
@@ -241,6 +250,14 @@
%changelog
+* Fri Sep 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.7.5-1
+- update to 0.7.5
+- build PIC objects on PPC (bug #1457)
+- enable CELT decoding via libcelt
+- support AMR WB encoding via libvo-amrwbenc (optional)
+- enable FreeType support
+- fix build with old celt
+
* Fri Jul 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.3.20110612git
- Add XvMC in ffmpeg
12 years, 7 months