rpms/x264/devel x264.spec,1.15,1.16
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23289
Modified Files:
x264.spec
Log Message:
20091026 snapshot
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- x264.spec 15 Oct 2009 21:05:17 -0000 1.15
+++ x264.spec 26 Oct 2009 14:23:34 -0000 1.16
@@ -1,10 +1,10 @@
-%global snapshot 20091007
-%global git 496d79d
+%global snapshot 20091026
+%global git ec46ace7
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.25.%{snapshot}git%{git}%{?dist}
+Release: 0.26.%{snapshot}git%{git}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -132,6 +132,9 @@
%endif
%changelog
+* Mon Oct 26 2009 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.26.20091026gitec46ace7
+- 20091026 snapshot
+
* Thu Oct 15 2009 kwizart <kwizart at gmail.com > - 0.0.0-0.25.20091007git496d79d
- Update to 20091007git
- Move simd to %%{_libdir}/sse2
14 years, 5 months
rpms/ffmpeg/devel ffmpeg.spec,1.21,1.22
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22988
Modified Files:
ffmpeg.spec
Log Message:
20091026 snapshot, requires recent x264
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ffmpeg.spec 22 Oct 2009 15:14:52 -0000 1.21
+++ ffmpeg.spec 26 Oct 2009 14:23:03 -0000 1.22
@@ -1,6 +1,6 @@
# TODO: add make test to %%check section
-%global svn 20091019
+%global svn 20091026
%global faad2min 1:2.6.1
Summary: Digital VCR and streaming server
@@ -38,7 +38,7 @@
BuildRequires: SDL-devel
BuildRequires: speex-devel
BuildRequires: texi2html
-BuildRequires: x264-devel >= 0.0.0-0.25.20091007
+BuildRequires: x264-devel >= 0.0.0-0.26.20091026
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -247,8 +247,8 @@
%changelog
-* Thu Oct 22 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-4.20091019svn
-- 20091019 snapshot
+* Thu Oct 22 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-4.20091026svn
+- 20091026 snapshot, requires recent x264
- dropped support for old amr libs (not supported upstream since July)
- don't disable yasm for generic builds
- fixed opencore amr support
14 years, 5 months
rpms/dvbcut/devel dvbcut.spec,1.10,1.11
by David Timms
Author: dtimms
Update of /cvs/free/rpms/dvbcut/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16681
Modified Files:
dvbcut.spec
Log Message:
disable attempt to smp compile
Index: dvbcut.spec
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dvbcut.spec 26 Oct 2009 12:32:29 -0000 1.10
+++ dvbcut.spec 26 Oct 2009 12:36:03 -0000 1.11
@@ -76,7 +76,7 @@
%configure --with-ffmpeg=%{_prefix} \
--with-ffmpeg-include=%{_includedir}/ffmpeg/
# It does not compile with smp_mflags
-make %{?_smp_mflags}
+make
%install
@@ -148,7 +148,6 @@
- add kde service menu for mpg files for dolphin
- add help menu to package
- fix help file being placed in /usr/share/help
-- allow smp compile
* Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 0.6.0-9.svn157
- Update desktop file according to F-12 FedoraStudio feature
14 years, 5 months
rpms/dvbcut/devel dvbcut-fix-help-path.patch, NONE, 1.1 dvbcut-servicemenu.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 dvbcut.desktop, 1.2, 1.3 dvbcut.spec, 1.9, 1.10 sources, 1.3, 1.4 dvbcut-0.6.0.gcc44-add-include.patch, 1.1, NONE
by David Timms
Author: dtimms
Update of /cvs/free/rpms/dvbcut/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16289
Modified Files:
.cvsignore dvbcut.desktop dvbcut.spec sources
Added Files:
dvbcut-fix-help-path.patch dvbcut-servicemenu.desktop
Removed Files:
dvbcut-0.6.0.gcc44-add-include.patch
Log Message:
update to svn166, cleanups, add desktop file integration
dvbcut-fix-help-path.patch:
--- NEW FILE dvbcut-fix-help-path.patch ---
--- src/dvbcut.cpp.orig 2009-10-26 00:05:33.000000000 +1100
+++ src/dvbcut.cpp 2009-10-26 23:07:56.000000000 +1100
@@ -2456,7 +2456,7 @@
#ifndef __WIN32__
// Unix/Linux: search in the associated share subdirectory
if (!QFile::exists(helpFile)) {
- helpFile = appDir.dirPath(true) + "/share/help/dvbcut_en.html";
+ helpFile = appDir.dirPath(true) + "/share/dvbcut/dvbcut_en.html";
}
#endif
if (QFile::exists(helpFile)) {
--- NEW FILE dvbcut-servicemenu.desktop ---
[Desktop Entry]
Type=Service
X-KDE-Priority=TopLevel
X-KDE-ServiceTypes=KonqPopupMenu/Plugin,video/mpg
Name=dvbcut mpeg2 tools
Comment=dvbcut editor menu
Icon=dvbcut
Actions=dvbcutOpenMpegStream;
Name[en_US]=dvbcut-servicemenu
[Desktop Action dvbcutOpenMpegStream]
Type=Application
Name=Open mpeg stream in dvbcut
Exec=dvbcut "%f"
Icon=dvbcut
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 29 Mar 2009 13:52:13 -0000 1.3
+++ .cvsignore 26 Oct 2009 12:32:29 -0000 1.4
@@ -1 +1 @@
-dvbcut-svn157.tar.bz2
+dvbcut-svn166.tar.bz2
Index: dvbcut.desktop
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dvbcut.desktop 23 Oct 2009 06:16:48 -0000 1.2
+++ dvbcut.desktop 26 Oct 2009 12:32:29 -0000 1.3
@@ -9,4 +9,6 @@
Icon=dvbcut
Terminal=false
Type=Application
+MimeType=video/mpeg;
+#nautilus /usr/share/applications, and refresh F5 to see changes to this file.
Index: dvbcut.spec
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dvbcut.spec 23 Oct 2009 06:16:48 -0000 1.9
+++ dvbcut.spec 26 Oct 2009 12:32:29 -0000 1.10
@@ -1,4 +1,4 @@
-%define svnrev 157
+%define svnrev 166
%if 0%{?fedora} > 6
%define qt3 qt3
%else
@@ -7,7 +7,7 @@
Name: dvbcut
Version: 0.6.0
-Release: 9.svn%{svnrev}%{?dist}
+Release: 10.svn%{svnrev}%{?dist}
Summary: Clip and convert DVB transport streams to MPEG2 program streams
Group: Applications/Multimedia
@@ -25,7 +25,9 @@
# This desktop file was created by hand.
Source4: %{name}.desktop
Source5: %{name}-snapshot.sh
-Patch0: %{name}-0.6.0.gcc44-add-include.patch
+Source6: %{name}-servicemenu.desktop
+# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut
+Patch0: %{name}-fix-help-path.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
@@ -35,9 +37,11 @@
BuildRequires: libmad-devel
BuildRequires: ffmpeg-devel
BuildRequires: desktop-file-utils
+BuildRequires: kde-filesystem
Requires: hicolor-icon-theme
# mplayer not actually required, but much better with it.
Requires: mplayer
+Requires: kde-filesystem
%description
dvbcut is a Qt application that allows you to select certain parts of an MPEG
@@ -51,7 +55,7 @@
%prep
%setup -q -n %{name}-svn%{svnrev}
-%patch0 -b .gcc44-add-include
+%patch0 -b .fix-help-path
# Fix QTDIR libs in configure
@@ -72,13 +76,14 @@
%configure --with-ffmpeg=%{_prefix} \
--with-ffmpeg-include=%{_includedir}/ffmpeg/
# It does not compile with smp_mflags
-make
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install \
bindir=%{buildroot}%{_bindir} \
+ helpdir=%{buildroot}%{_datadir}/%{name} \
mandir=%{buildroot}%{_mandir}
# manual install of icons
@@ -96,6 +101,11 @@
desktop-file-install --vendor="" \
--dir %{buildroot}%{_datadir}/applications %{SOURCE4}
+#in future: %{_kde4_servicesdir}, but for now
+mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/
+desktop-file-install \
+ --dir=%{buildroot}%{_kde4_datadir}/kde4/services \
+ %{SOURCE6}
%clean
rm -rf %{buildroot}
@@ -107,6 +117,8 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+update-desktop-database &> /dev/null || :
+
%postun
touch --no-create %{_datadir}/icons/hicolor || :
@@ -114,6 +126,8 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+update-desktop-database &> /dev/null || :
+
%files
%defattr(-,root,root,-)
@@ -122,9 +136,20 @@
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/%{name}/dvbcut_*.html
+%{_kde4_datadir}/kde4/services/*.desktop
%changelog
+* Mon Oct 26 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-10.svn166
+- update to svn166
+- drop upstreamed gcc44 patch
+- add mpg mimetype to gnome desktop to provide mpeg open with in nautilus
+- add kde service menu for mpg files for dolphin
+- add help menu to package
+- fix help file being placed in /usr/share/help
+- allow smp compile
+
* Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 0.6.0-9.svn157
- Update desktop file according to F-12 FedoraStudio feature
@@ -243,4 +268,3 @@
* Thu Nov 08 2007 David Timms <iinet.net.au at dtimms> - 0.5.4-0.1
- initial package for fedora (based on Herbert Graeber packman effort)
-
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 29 Mar 2009 13:52:13 -0000 1.3
+++ sources 26 Oct 2009 12:32:29 -0000 1.4
@@ -1 +1 @@
-0d397162702d0001e540d57f836662fd dvbcut-svn157.tar.bz2
+9f7f4aaf61cf236422c07aa8d8617126 dvbcut-svn166.tar.bz2
--- dvbcut-0.6.0.gcc44-add-include.patch DELETED ---
14 years, 5 months
rpms/ffmpeg/F-11 ffmpeg-ppc.patch,NONE,1.1 ffmpeg.spec,1.16,1.17
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11403
Modified Files:
ffmpeg.spec
Added Files:
ffmpeg-ppc.patch
Log Message:
* Thu Oct 22 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-3
- dropped workaround for non-standard openjpeg headers location
- Add BR dirac vdpau. (kwizart)
- Don't build faac by default because it's nonfree. (kwizart)
- fixed PowerPC builds (bug 808)
ffmpeg-ppc.patch:
--- NEW FILE ffmpeg-ppc.patch ---
--- ffmpeg-0.5/configure.pic 2009-09-07 13:29:28.000000000 +0100
+++ ffmpeg-0.5/configure 2009-09-07 13:29:44.000000000 +0100
@@ -2191,7 +2191,7 @@ if enabled shared; then
# LIBOBJFLAGS may have already been set in the OS configuration
if test -z "$LIBOBJFLAGS" ; then
case "${subarch-$arch}" in
- x86_64|ia64|alpha|sparc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;;
+ x86_64|ia64|alpha|sparc*|ppc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;;
esac
fi
fi
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-11/ffmpeg.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ffmpeg.spec 26 Mar 2009 23:06:34 -0000 1.16
+++ ffmpeg.spec 26 Oct 2009 01:26:55 -0000 1.17
@@ -5,24 +5,29 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
# get rid of textrels on x86_64 in yasm code
Patch0: %{name}-textrel.patch
+# fix ppc builds
+Patch1: %{name}-ppc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
BuildRequires: bzip2-devel
-BuildRequires: faac-devel
+BuildRequires: dirac-devel
+%{?_with_faac:BuildRequires: faac-devel}
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: gsm-devel
BuildRequires: imlib2-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
BuildRequires: libtheora-devel
+%{?_with_vaapi:BuildRequires:libva-devel >= 0.31.0}
+BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
@@ -79,12 +84,13 @@
--libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
- --extra-cflags="$RPM_OPT_FLAGS -I%{_includedir}/openjpeg" \\\
+ --extra-cflags="$RPM_OPT_FLAGS" \\\
--extra-version=rpmfusion \\\
%{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\
--enable-bzlib \\\
--enable-libdc1394 \\\
- --enable-libfaac \\\
+ --enable-libdirac \\\
+ %{?_with_faac:--enable-libfaac --enable-nonfree} \\\
--enable-libfaad \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
@@ -95,6 +101,7 @@
--enable-libvorbis \\\
--enable-libx264 \\\
--enable-libxvid \\\
+ --enable-vdpau \\\
--enable-x11grab \\\
--enable-avfilter \\\
--enable-avfilter-lavf \\\
@@ -111,6 +118,7 @@
%prep
%setup -q
%patch0 -p1 -b .textrel
+%patch1 -p1 -b .ppc
%build
mkdir generic
@@ -247,6 +255,12 @@
%changelog
+* Thu Oct 22 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-3
+- dropped workaround for non-standard openjpeg headers location
+- Add BR dirac vdpau. (kwizart)
+- Don't build faac by default because it's nonfree. (kwizart)
+- fixed PowerPC builds (bug 808)
+
* Fri Mar 27 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-2
- rebuild for new faad2 and x264
14 years, 5 months
rpms/ffmpeg/F-10 ffmpeg-r15348.patch, NONE, 1.1 ffmpeg-r16791-16793.patch, NONE, 1.1 ffmpeg-r17163-17311.patch, NONE, 1.1 ffmpeg-snapshot.sh, 1.2, 1.3 ffmpeg.spec, 1.11, 1.12
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8658
Modified Files:
ffmpeg-snapshot.sh ffmpeg.spec
Added Files:
ffmpeg-r15348.patch ffmpeg-r16791-16793.patch
ffmpeg-r17163-17311.patch
Log Message:
* Mon Oct 26 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.56.20080908
- backport audio resampler fixes (bug #426)
- add a requirement on exact EVR between main package and -libs
so that "yum update ffmpeg" works as expected
- install presets (backport)
- use bindir instead of prefix/bin
ffmpeg-r15348.patch:
--- NEW FILE ffmpeg-r15348.patch ---
Index: ffpresets/libx264-fastfirstpass.ffpreset
===================================================================
--- ffpresets/libx264-fastfirstpass.ffpreset (revision 0)
+++ ffpresets/libx264-fastfirstpass.ffpreset (revision 15348)
@@ -0,0 +1,21 @@
+coder=1
+flags=+loop
+cmp=+chroma
+partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+me=dia
+subq=1
+me_range=16
+g=250
+keyint_min=25
+sc_threshold=40
+i_qfactor=0.71
+b_strategy=1
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+refs=1
+directpred=1
+bidir_refine=0
+trellis=0
+flags2=-bpyramid-wpred-brdo-mixed_refs-dct8x8+fastpskip
Index: ffpresets/libx264-default.ffpreset
===================================================================
--- ffpresets/libx264-default.ffpreset (revision 0)
+++ ffpresets/libx264-default.ffpreset (revision 15348)
@@ -0,0 +1,18 @@
+coder=1
+flags=+loop
+cmp=+chroma
+partitions=+parti8x8+parti4x4+partp8x8+partb8x8
+me=hex
+subq=5
+me_range=16
+g=250
+keyint_min=25
+sc_threshold=40
+i_qfactor=0.71
+b_strategy=1
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+directpred=1
+flags2=+fastpskip
Index: ffpresets/libx264-max.ffpreset
===================================================================
--- ffpresets/libx264-max.ffpreset (revision 0)
+++ ffpresets/libx264-max.ffpreset (revision 15348)
@@ -0,0 +1,22 @@
+coder=1
+flags=+loop
+cmp=+chroma
+partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
+me=tesa
+subq=7
+me_range=32
+g=250
+keyint_min=25
+sc_threshold=40
+i_qfactor=0.71
+b_strategy=1
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+bf=16
+refs=16
+directpred=3
+bidir_refine=1
+trellis=2
+flags2=+bpyramid+wpred+brdo+mixed_refs+dct8x8-fastpskip
Index: ffpresets/libx264-hq.ffpreset
===================================================================
--- ffpresets/libx264-hq.ffpreset (revision 0)
+++ ffpresets/libx264-hq.ffpreset (revision 15348)
@@ -0,0 +1,22 @@
+coder=1
+flags=+loop
+cmp=+chroma
+partitions=+parti8x8+parti4x4+partp8x8+partb8x8
+me=umh
+subq=7
+me_range=16
+g=250
+keyint_min=25
+sc_threshold=40
+i_qfactor=0.71
+b_strategy=1
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+bf=16
+refs=4
+directpred=3
+bidir_refine=1
+trellis=1
+flags2=+bpyramid+wpred+brdo+mixed_refs+dct8x8+fastpskip
Index: ffpresets/libx264-normal.ffpreset
===================================================================
--- ffpresets/libx264-normal.ffpreset (revision 0)
+++ ffpresets/libx264-normal.ffpreset (revision 15348)
@@ -0,0 +1,22 @@
+coder=1
+flags=+loop
+cmp=+chroma
+partitions=+parti8x8+parti4x4+partp8x8+partb8x8
+me=hex
+subq=6
+me_range=16
+g=250
+keyint_min=25
+sc_threshold=40
+i_qfactor=0.71
+b_strategy=1
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+bf=16
+refs=2
+directpred=3
+bidir_refine=1
+trellis=0
+flags2=+bpyramid+wpred+dct8x8+fastpskip
ffmpeg-r16791-16793.patch:
--- NEW FILE ffmpeg-r16791-16793.patch ---
Index: configure
===================================================================
--- configure (revision 16790)
+++ configure (revision 16793)
@@ -64,6 +64,7 @@
echo " --disable-logging do not log configure debug information"
echo " --prefix=PREFIX install in PREFIX [$prefix]"
echo " --bindir=DIR install binaries in DIR [PREFIX/bin]"
+ echo " --datadir=DIR install data files in DIR [PREFIX/share/ffmpeg]"
echo " --libdir=DIR install libs in DIR [PREFIX/lib]"
echo " --shlibdir=DIR install shared libs in DIR [PREFIX/lib]"
echo " --incdir=DIR install includes in DIR [PREFIX/include]"
@@ -264,6 +265,10 @@
echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
}
+c_escape(){
+ echo "$*" | sed 's/["\\]/\\\0/g'
+}
+
set_all(){
value=$1
shift
@@ -914,6 +919,7 @@
PATHS_LIST='
bindir
+ datadir
incdir
libdir
mandir
@@ -1113,6 +1119,7 @@
# installation paths
prefix_default="/usr/local"
bindir_default='${prefix}/bin'
+datadir_default='${prefix}/share/ffmpeg'
incdir_default='${prefix}/include'
libdir_default='${prefix}/lib'
mandir_default='${prefix}/share/man'
@@ -2258,6 +2265,7 @@
echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
+echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH
echo "FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION" >> config.mak
echo "prefix=$prefix" >> config.mak
@@ -2265,6 +2273,7 @@
echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak
echo "BINDIR=\$(DESTDIR)$bindir" >> config.mak
+echo "DATADIR=\$(DESTDIR)$datadir" >> config.mak
echo "MANDIR=\$(DESTDIR)$mandir" >> config.mak
echo "CC=$cc" >> config.mak
echo "YASM=$yasmexe" >> config.mak
Index: Makefile
===================================================================
--- Makefile (revision 16790)
+++ Makefile (revision 16793)
@@ -24,6 +24,8 @@
FFLIBS := avdevice avformat avcodec avutil
+DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
+
include common.mak
FF_LDFLAGS := $(FFLDFLAGS)
@@ -35,7 +37,7 @@
INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
ifneq ($(PROGS),)
-INSTALL_TARGETS-yes += install-progs
+INSTALL_TARGETS-yes += install-progs install-data
INSTALL_TARGETS-$(BUILD_DOC) += install-man
endif
INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs
@@ -129,6 +131,10 @@
install -d "$(BINDIR)"
install -c -m 755 $(PROGS) "$(BINDIR)"
+install-data: $(DATA_FILES)
+ install -d "$(DATADIR)"
+ install -m 644 $(DATA_FILES) "$(DATADIR)"
+
install-man: $(MANPAGES)
install -d "$(MANDIR)/man1"
install -m 644 $(MANPAGES) "$(MANDIR)/man1"
@@ -137,11 +143,14 @@
install -d "$(SHLIBDIR)/vhook"
install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
-uninstall: uninstall-progs uninstall-man uninstall-vhook
+uninstall: uninstall-progs uninstall-data uninstall-man uninstall-vhook
uninstall-progs:
rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS))
+uninstall-data:
+ rm -rf "$(DATADIR)"
+
uninstall-man:
rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
ffmpeg-r17163-17311.patch:
--- NEW FILE ffmpeg-r17163-17311.patch ---
Index: ffmpeg.c
===================================================================
--- ffmpeg.c (revision 17162)
+++ ffmpeg.c (revision 17163)
@@ -555,12 +555,12 @@
ost->audio_resample = 1;
if (ost->audio_resample && !ost->resample) {
- if (dec->sample_fmt != SAMPLE_FMT_S16) {
- fprintf(stderr, "Audio resampler only works with 16 bits per sample, patch welcome.\n");
- av_exit(1);
- }
- ost->resample = audio_resample_init(enc->channels, dec->channels,
- enc->sample_rate, dec->sample_rate);
+ if (dec->sample_fmt != SAMPLE_FMT_S16)
+ fprintf(stderr, "Warning, using s16 intermediate sample format for resampling\n");
+ ost->resample = av_audio_resample_init(enc->channels, dec->channels,
+ enc->sample_rate, dec->sample_rate,
+ enc->sample_fmt, dec->sample_fmt,
+ 16, 10, 0, 0.8);
if (!ost->resample) {
fprintf(stderr, "Can not resample %d channels @ %d Hz to %d channels @ %d Hz\n",
dec->channels, dec->sample_rate,
@@ -570,7 +570,7 @@
}
#define MAKE_SFMT_PAIR(a,b) ((a)+SAMPLE_FMT_NB*(b))
- if (dec->sample_fmt!=enc->sample_fmt &&
+ if (!ost->audio_resample && dec->sample_fmt!=enc->sample_fmt &&
MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt)!=ost->reformat_pair) {
if (!audio_out2)
audio_out2 = av_malloc(audio_out_size);
@@ -647,7 +647,7 @@
size_out = size;
}
- if (dec->sample_fmt!=enc->sample_fmt) {
+ if (!ost->audio_resample && dec->sample_fmt!=enc->sample_fmt) {
const void *ibuf[6]= {buftmp};
void *obuf[6]= {audio_out2};
int istride[6]= {isize};
Index: libavcodec/resample.c
===================================================================
--- libavcodec/resample.c (revision 17162)
+++ libavcodec/resample.c (revision 17163)
@@ -25,16 +25,32 @@
*/
#include "avcodec.h"
+#include "audioconvert.h"
+#include "opt.h"
struct AVResampleContext;
+static const char *context_to_name(void *ptr)
+{
+ return "audioresample";
+}
+
+static const AVOption options[] = {{NULL}};
+static const AVClass audioresample_context_class = { "ReSampleContext", context_to_name, options };
+
struct ReSampleContext {
+ const AVClass *av_class;
struct AVResampleContext *resample_context;
short *temp[2];
int temp_len;
float ratio;
/* channel convert */
int input_channels, output_channels, filter_channels;
+ AVAudioConvert *convert_ctx[2];
+ enum SampleFormat sample_fmt[2]; ///< input and output sample format
+ unsigned sample_size[2]; ///< size of one sample in sample_fmt
+ short *buffer[2]; ///< buffers used for conversion to S16
+ unsigned buffer_size[2]; ///< sizes of allocated buffers
};
/* n1: number of samples */
@@ -126,8 +142,12 @@
}
}
-ReSampleContext *audio_resample_init(int output_channels, int input_channels,
- int output_rate, int input_rate)
+ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
+ int output_rate, int input_rate,
+ enum SampleFormat sample_fmt_out,
+ enum SampleFormat sample_fmt_in,
+ int filter_length, int log2_phase_count,
+ int linear, double cutoff)
{
ReSampleContext *s;
@@ -153,6 +173,34 @@
if (s->output_channels < s->filter_channels)
s->filter_channels = s->output_channels;
+ s->sample_fmt [0] = sample_fmt_in;
+ s->sample_fmt [1] = sample_fmt_out;
+ s->sample_size[0] = av_get_bits_per_sample_format(s->sample_fmt[0])>>3;
+ s->sample_size[1] = av_get_bits_per_sample_format(s->sample_fmt[1])>>3;
+
+ if (s->sample_fmt[0] != SAMPLE_FMT_S16) {
+ if (!(s->convert_ctx[0] = av_audio_convert_alloc(SAMPLE_FMT_S16, 1,
+ s->sample_fmt[0], 1, NULL, 0))) {
+ av_log(s, AV_LOG_ERROR,
+ "Cannot convert %s sample format to s16 sample format\n",
+ avcodec_get_sample_fmt_name(s->sample_fmt[0]));
+ av_free(s);
+ return NULL;
+ }
+ }
+
+ if (s->sample_fmt[1] != SAMPLE_FMT_S16) {
+ if (!(s->convert_ctx[1] = av_audio_convert_alloc(s->sample_fmt[1], 1,
+ SAMPLE_FMT_S16, 1, NULL, 0))) {
+ av_log(s, AV_LOG_ERROR,
+ "Cannot convert s16 sample format to %s sample format\n",
+ avcodec_get_sample_fmt_name(s->sample_fmt[1]));
+ av_audio_convert_free(s->convert_ctx[0]);
+ av_free(s);
+ return NULL;
+ }
+ }
+
/*
* AC-3 output is the only case where filter_channels could be greater than 2.
* input channels can't be greater than 2, so resample the 2 channels and then
@@ -162,11 +210,25 @@
s->filter_channels = 2;
#define TAPS 16
- s->resample_context= av_resample_init(output_rate, input_rate, TAPS, 10, 0, 0.8);
+ s->resample_context= av_resample_init(output_rate, input_rate,
+ filter_length, log2_phase_count, linear, cutoff);
+ s->av_class= &audioresample_context_class;
+
return s;
}
+#if LIBAVCODEC_VERSION_MAJOR < 53
+ReSampleContext *audio_resample_init(int output_channels, int input_channels,
+ int output_rate, int input_rate)
+{
+ return av_audio_resample_init(output_channels, input_channels,
+ output_rate, input_rate,
+ SAMPLE_FMT_S16, SAMPLE_FMT_S16,
+ TAPS, 10, 0, 0.8);
+}
+#endif
+
/* resample audio. 'nb_samples' is the number of input samples */
/* XXX: optimize it ! */
int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples)
@@ -175,6 +237,7 @@
short *bufin[2];
short *bufout[2];
short *buftmp2[2], *buftmp3[2];
+ short *output_bak = NULL;
int lenout;
if (s->input_channels == s->output_channels && s->ratio == 1.0 && 0) {
@@ -183,6 +246,52 @@
return nb_samples;
}
+ if (s->sample_fmt[0] != SAMPLE_FMT_S16) {
+ int istride[1] = { s->sample_size[0] };
+ int ostride[1] = { 2 };
+ const void *ibuf[1] = { input };
+ void *obuf[1];
+ unsigned input_size = nb_samples*s->input_channels*2;
+
+ if (!s->buffer_size[0] || s->buffer_size[0] < input_size) {
+ av_free(s->buffer[0]);
+ s->buffer_size[0] = input_size;
+ s->buffer[0] = av_malloc(s->buffer_size[0]);
+ if (!s->buffer[0]) {
+ av_log(s, AV_LOG_ERROR, "Could not allocate buffer\n");
+ return 0;
+ }
+ }
+
+ obuf[0] = s->buffer[0];
+
+ if (av_audio_convert(s->convert_ctx[0], obuf, ostride,
+ ibuf, istride, nb_samples*s->input_channels) < 0) {
+ av_log(s, AV_LOG_ERROR, "Audio sample format conversion failed\n");
+ return 0;
+ }
+
+ input = s->buffer[0];
+ }
+
+ lenout= 4*nb_samples * s->ratio + 16;
+
+ if (s->sample_fmt[1] != SAMPLE_FMT_S16) {
+ output_bak = output;
+
+ if (!s->buffer_size[1] || s->buffer_size[1] < lenout) {
+ av_free(s->buffer[1]);
+ s->buffer_size[1] = lenout;
+ s->buffer[1] = av_malloc(s->buffer_size[1]);
+ if (!s->buffer[1]) {
+ av_log(s, AV_LOG_ERROR, "Could not allocate buffer\n");
+ return 0;
+ }
+ }
+
+ output = s->buffer[1];
+ }
+
/* XXX: move those malloc to resample init code */
for(i=0; i<s->filter_channels; i++){
bufin[i]= av_malloc( (nb_samples + s->temp_len) * sizeof(short) );
@@ -191,7 +300,6 @@
}
/* make some zoom to avoid round pb */
- lenout= 4*nb_samples * s->ratio + 16;
bufout[0]= av_malloc( lenout * sizeof(short) );
bufout[1]= av_malloc( lenout * sizeof(short) );
@@ -233,6 +341,19 @@
ac3_5p1_mux(output, buftmp3[0], buftmp3[1], nb_samples1);
}
+ if (s->sample_fmt[1] != SAMPLE_FMT_S16) {
+ int istride[1] = { 2 };
+ int ostride[1] = { s->sample_size[1] };
+ const void *ibuf[1] = { output };
+ void *obuf[1] = { output_bak };
+
+ if (av_audio_convert(s->convert_ctx[1], obuf, ostride,
+ ibuf, istride, nb_samples1*s->output_channels) < 0) {
+ av_log(s, AV_LOG_ERROR, "Audio sample format convertion failed\n");
+ return 0;
+ }
+ }
+
for(i=0; i<s->filter_channels; i++)
av_free(bufin[i]);
@@ -246,5 +367,9 @@
av_resample_close(s->resample_context);
av_freep(&s->temp[0]);
av_freep(&s->temp[1]);
+ av_freep(&s->buffer[0]);
+ av_freep(&s->buffer[1]);
+ av_audio_convert_free(s->convert_ctx[0]);
+ av_audio_convert_free(s->convert_ctx[1]);
av_free(s);
}
Index: libavcodec/avcodec.h
===================================================================
--- libavcodec/avcodec.h (revision 17162)
+++ libavcodec/avcodec.h (revision 17163)
@@ -2443,8 +2443,36 @@
typedef struct ReSampleContext ReSampleContext;
-ReSampleContext *audio_resample_init(int output_channels, int input_channels,
- int output_rate, int input_rate);
+#if LIBAVCODEC_VERSION_MAJOR < 53
+/**
+ * @deprecated Use av_audio_resample_init() instead.
+ */
+attribute_deprecated ReSampleContext *audio_resample_init(int output_channels, int input_channels,
+ int output_rate, int input_rate);
+#endif
+/**
+ * Initializes audio resampling context
+ *
+ * @param output_channels number of output channels
+ * @param input_channels number of input channels
+ * @param output_rate output sample rate
+ * @param input_rate input sample rate
+ * @param sample_fmt_out requested output sample format
+ * @param sample_fmt_in input sample format
+ * @param filter_length length of each FIR filter in the filterbank relative to the cutoff freq
+ * @param log2_phase_count log2 of the number of entries in the polyphase filterbank
+ * @param linear If 1 then the used FIR filter will be linearly interpolated
+ between the 2 closest, if 0 the closest will be used
+ * @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
+ * @return allocated ReSampleContext, NULL if error occured
+ */
+ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
+ int output_rate, int input_rate,
+ enum SampleFormat sample_fmt_out,
+ enum SampleFormat sample_fmt_in,
+ int filter_length, int log2_phase_count,
+ int linear, double cutoff);
+
int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
void audio_resample_close(ReSampleContext *s);
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-10/ffmpeg-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-snapshot.sh 5 Sep 2008 15:17:52 -0000 1.2
+++ ffmpeg-snapshot.sh 26 Oct 2009 00:39:28 -0000 1.3
@@ -13,10 +13,13 @@
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y%m%d)
+svn=20080908
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
-cd ffmpeg-$svn
+cd ffmpeg-$svn/libswscale
+svn update -r {$svn}
+cd ..
./version.sh . version.h
find . -type d -name .svn -print0 | xargs -0r rm -rf
sed -i -e '/^\.PHONY: version\.h$/d' Makefile
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-10/ffmpeg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ffmpeg.spec 8 Mar 2009 23:02:44 -0000 1.11
+++ ffmpeg.spec 26 Oct 2009 00:39:28 -0000 1.12
@@ -6,7 +6,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.55.%{svn}%{?dist}
+Release: 0.56.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
@@ -25,8 +25,15 @@
Patch11: %{name}-r16846.patch
# backport av_find_nearest_q_idx for dvdstyler
Patch12: %{name}-r15415.patch
+# backport presets
+Patch13: %{name}-r15348.patch
+# backport audio resampling fix
+Patch14: %{name}-r17163-17311.patch
+# backport presets installation
+Patch15: %{name}-r16791-16793.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: %{name}-libs = %{version}-%{release}
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
BuildRequires: bzip2-devel
BuildRequires: faac-devel
@@ -84,6 +91,8 @@
%define ff_configure \
../configure \\\
--prefix=%{_prefix} \\\
+ --bindir=%{_bindir} \\\
+ --datadir=%{_datadir}/ffmpeg \\\
--incdir=%{_includedir}/ffmpeg \\\
--libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
@@ -123,6 +132,9 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p0
+%patch14 -p0
+%patch15 -p0
%build
mkdir generic
@@ -220,10 +232,10 @@
%files
%defattr(-,root,root,-)
%doc COPYING.GPL CREDITS Changelog README __doc/*.*
-# Note: as of 20070204, "configure" doesn't have --bindir.
-%{_prefix}/bin/ffmpeg
-%{_prefix}/bin/ffplay
-%{_prefix}/bin/ffserver
+%{_bindir}/ffmpeg
+%{_bindir}/ffplay
+%{_bindir}/ffserver
+%{_datadir}/ffmpeg
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffserver.1*
@@ -262,6 +274,13 @@
%changelog
+* Mon Oct 26 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.56.20080908
+- backport audio resampler fixes (bug #426)
+- add a requirement on exact EVR between main package and -libs
+ so that "yum update ffmpeg" works as expected
+- install presets (backport)
+- use bindir instead of prefix/bin
+
* Sun Mar 08 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.55.20080908
- backport support for Dirac in Matroska
- add comments for all patches
14 years, 5 months
rpms/sdlmame/F-10 .cvsignore, 1.58, 1.59 sdlmame.spec, 1.68, 1.69 sources, 1.59, 1.60
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16048
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Sun Oct 25 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.4.0134u4
- Updated to 0.134u4
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore 12 Oct 2009 20:44:33 -0000 1.58
+++ .cvsignore 25 Oct 2009 17:27:25 -0000 1.59
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0134u3.zip
+sdlmame0134u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sdlmame.spec 12 Oct 2009 20:44:33 -0000 1.68
+++ sdlmame.spec 25 Oct 2009 17:27:25 -0000 1.69
@@ -1,7 +1,7 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global beta 0134u3
+%global beta 0134u4
%if "0%{?beta}" != "0"
%global _version %{?beta}
@@ -21,7 +21,7 @@
Name: sdlmame
Version: 0135
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -206,6 +206,9 @@
%changelog
+* Sun Oct 25 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.4.0134u4
+- Updated to 0.134u4
+
* Mon Oct 12 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.3.0134u3
- Updated to 0.134u3
- Added BSD to the License tag
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 12 Oct 2009 20:44:33 -0000 1.59
+++ sources 25 Oct 2009 17:27:25 -0000 1.60
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-7531c3f4e2a21d4e259ecbf40dc3b206 sdlmame0134u3.zip
+d9687aa3716e63cfc4539ec023467ed3 sdlmame0134u4.zip
14 years, 5 months
rpms/sdlmame/F-11 .cvsignore, 1.56, 1.57 sdlmame.spec, 1.66, 1.67 sources, 1.58, 1.59
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15948
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Sun Oct 25 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.4.0134u4
- Updated to 0.134u4
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore 12 Oct 2009 20:44:25 -0000 1.56
+++ .cvsignore 25 Oct 2009 17:27:12 -0000 1.57
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0134u3.zip
+sdlmame0134u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sdlmame.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sdlmame.spec 12 Oct 2009 20:44:25 -0000 1.66
+++ sdlmame.spec 25 Oct 2009 17:27:12 -0000 1.67
@@ -1,7 +1,7 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global beta 0134u3
+%global beta 0134u4
%if "0%{?beta}" != "0"
%global _version %{?beta}
@@ -21,7 +21,7 @@
Name: sdlmame
Version: 0135
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -206,6 +206,9 @@
%changelog
+* Sun Oct 25 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.4.0134u4
+- Updated to 0.134u4
+
* Mon Oct 12 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.3.0134u3
- Updated to 0.134u3
- Added BSD to the License tag
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 12 Oct 2009 20:44:25 -0000 1.58
+++ sources 25 Oct 2009 17:27:12 -0000 1.59
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-7531c3f4e2a21d4e259ecbf40dc3b206 sdlmame0134u3.zip
+d9687aa3716e63cfc4539ec023467ed3 sdlmame0134u4.zip
14 years, 5 months
rpms/sdlmame/devel .cvsignore, 1.59, 1.60 sdlmame.spec, 1.69, 1.70 sources, 1.60, 1.61
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15839
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Sun Oct 25 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.4.0134u4
- Updated to 0.134u4
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore 12 Oct 2009 20:44:16 -0000 1.59
+++ .cvsignore 25 Oct 2009 17:27:01 -0000 1.60
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0134u3.zip
+sdlmame0134u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sdlmame.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sdlmame.spec 12 Oct 2009 20:44:16 -0000 1.69
+++ sdlmame.spec 25 Oct 2009 17:27:01 -0000 1.70
@@ -1,7 +1,7 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global beta 0134u3
+%global beta 0134u4
%if "0%{?beta}" != "0"
%global _version %{?beta}
@@ -21,7 +21,7 @@
Name: sdlmame
Version: 0135
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -206,6 +206,9 @@
%changelog
+* Sun Oct 25 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.4.0134u4
+- Updated to 0.134u4
+
* Mon Oct 12 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0135-0.3.0134u3
- Updated to 0.134u3
- Added BSD to the License tag
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources 12 Oct 2009 20:44:16 -0000 1.60
+++ sources 25 Oct 2009 17:27:01 -0000 1.61
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-7531c3f4e2a21d4e259ecbf40dc3b206 sdlmame0134u3.zip
+d9687aa3716e63cfc4539ec023467ed3 sdlmame0134u4.zip
14 years, 5 months
rpms/xmms2-nonfree/devel xmms2-nonfree.spec,1.4,1.5
by Orcan Ogetbil
Author: oget
Update of /cvs/nonfree/rpms/xmms2-nonfree/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15135
Modified Files:
xmms2-nonfree.spec
Log Message:
* Sun Oct 25 2009 John Doe <anonymous(a)american.us> 0.6-4
- Rename subpackages to fix broken deps (RFBZ#894)
Index: xmms2-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/xmms2-nonfree.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms2-nonfree.spec 21 Oct 2009 13:32:10 -0000 1.4
+++ xmms2-nonfree.spec 25 Oct 2009 17:14:39 -0000 1.5
@@ -3,7 +3,7 @@
Name: xmms2-nonfree
Summary: Nonfree plugins for XMMS2
Version: 0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv2+ and GPLv2+
Group: Applications/Multimedia
# Fedora's xmms2 has to use a sanitized tarball, we don't.
@@ -40,22 +40,26 @@
to the XMMS2 framework, but most users will want to install a graphical XMMS2
client (such as gxmms2 or esperanza).
-%package mac
+%package -n xmms2-mac
Summary: XMMS2 plugin for APE audio format
Group: Applications/Multimedia
License: LGPLv2+
Requires: xmms2 = %{version}
+Obsoletes: xmms2-nonfree-mac < 0.6-4
+Provides: xmms2-nonfree-mac = %{version}-%{release}
-%description mac
+%description -n xmms2-mac
This package contains an XMMS2 Plugin for listening to Monkey's Audio files.
-%package sid
+%package -n xmms2-sid
Summary: XMMS2 plugin for SID audio format
Group: Applications/Multimedia
License: GPLv2+
Requires: xmms2 = %{version}
+Obsoletes: xmms2-nonfree-sid < 0.6-4
+Provides: xmms2-nonfree-sid = %{version}-%{release}
-%description sid
+%description -n xmms2-sid
This package contains an XMMS2 Plugin for listening to C64 mono and stereo file
formats.
@@ -176,17 +180,20 @@
%defattr(-,root,root,-)
%doc COPYING.GPL COPYING.LGPL
-%files mac
+%files -n xmms2-mac
%defattr(-,root,root,-)
%doc COPYING.LGPL
%{_libdir}/xmms2/libxmms_mac.so
-%files sid
+%files -n xmms2-sid
%defattr(-,root,root,-)
%doc COPYING.GPL
%{_libdir}/xmms2/libxmms_sid.so
%changelog
+* Sun Oct 25 2009 John Doe <anonymous(a)american.us> 0.6-4
+- Rename subpackages to fix broken deps (RFBZ#894)
+
* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.6-3
- rebuild for new ffmpeg
14 years, 5 months