rpms/mplayer/devel .cvsignore, 1.14, 1.15 mplayer.spec, 1.25, 1.26 sources, 1.15, 1.16
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26027
Modified Files:
.cvsignore mplayer.spec sources
Log Message:
* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.112.20100116svn
- 20100116 snapshot
- rebuild against current x264
- fix licence tag when compiled with OpenCore AMR
- fix build --with faac (bug #997)
- enable radio support (bug #634)
- openal-devel is now openal-soft-devel (bug #935)
- move some files to -common subpackage, adjust dependencies (bug #1037)
- introduce -tools subpackage, move scripts there (bugs #544, #1037)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 30 Oct 2009 01:10:22 -0000 1.14
+++ .cvsignore 17 Jan 2010 03:31:18 -0000 1.15
@@ -1,2 +1,2 @@
Blue-1.7.tar.bz2
-mplayer-export-2009-10-29.tar.bz2
+mplayer-export-2010-01-16.tar.bz2
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mplayer.spec 16 Jan 2010 21:30:10 -0000 1.25
+++ mplayer.spec 17 Jan 2010 03:31:18 -0000 1.26
@@ -1,16 +1,20 @@
%define codecdir %{_libdir}/codecs
-%define pre 20091029svn
+%define pre 20100116svn
%define svn 1
-%define svnbuild 2009-10-29
+%define svnbuild 2010-01-16
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.111.%{pre}%{?dist}
+Release: 0.112.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
+%if 0%{!?_without_amr:1}
+License: GPLv3+
+%else
License: GPLv2+
+%endif
URL: http://www.mplayerhq.hu/
%if %{svn}
# run ./mplayer-snapshot.sh to get this
@@ -34,7 +38,6 @@
BuildRequires: desktop-file-utils
BuildRequires: em8300-devel
BuildRequires: enca-devel
-%{?_with_faac: BuildRequires: faac-devel}
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.9
@@ -66,17 +69,18 @@
BuildRequires: schroedinger-devel
BuildRequires: speex-devel >= 1.1
BuildRequires: twolame-devel
-BuildRequires: x264-devel >= 0.0.0-0.26.20091026
+BuildRequires: x264-devel >= 0.0.0-0.27
BuildRequires: xvidcore-devel >= 0.9.2
BuildRequires: yasm
%{?_with_arts:BuildRequires: arts-devel}
%{!?_without_amr:BuildRequires: opencore-amr-devel}
%{?_with_directfb:BuildRequires: directfb-devel}
%{?_with_esound:BuildRequires: esound-devel}
+%{?_with_faac:BuildRequires: faac-devel}
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
%{?_with_libmad:BuildRequires: libmad-devel}
%{?_with_nemesi:BuildRequires: libnemesi-devel >= 0.6.3}
-%{?_with_openal:BuildRequires: openal-devel}
+%{?_with_openal:BuildRequires: openal-soft-devel}
%{?_with_samba:BuildRequires: libsmbclient-devel}
%{?_with_svgalib:BuildRequires: svgalib-devel}
%{?_with_xmms:BuildRequires: xmms-devel}
@@ -89,6 +93,7 @@
%endif
Obsoletes: mplayer-fonts
Requires: faad2-libs >= %{faad2min}
+Requires: mplayer-common = %{version}-%{release}
%description
MPlayer is a movie player that plays most MPEG, VOB, AVI, OGG/OGM,
@@ -101,7 +106,8 @@
Non-default rpmbuild options:
--with samba: Enable Samba (smb://) support
--with xmms: Enable XMMS input plugin support
---with amr: Enable AMR support
+--without amr: Disable AMR support
+--with faac: Enable FAAC support
--with libmad: Enable libmad support
--with openal: Enable OpenAL support
--with jack: Enable JACK support
@@ -111,10 +117,17 @@
--with svgalib: Enable SVGAlib support
--with nemesi: Enable libnemesi RTSP support
+%package common
+Summary: MPlayer common files
+Group: Applications/Multimedia
+
+%description common
+This package contains common files for MPlayer packages.
+
%package gui
Summary: GUI for MPlayer
Group: Applications/Multimedia
-Requires: mplayer = %{version}-%{release}
+Requires: mplayer-common = %{version}-%{release}
Requires: hicolor-icon-theme
%description gui
@@ -123,7 +136,7 @@
%package -n mencoder
Summary: MPlayer movie encoder
Group: Applications/Multimedia
-Requires: mplayer = %{version}-%{release}
+Requires: mplayer-common = %{version}-%{release}
%description -n mencoder
This package contains the MPlayer movie encoder.
@@ -135,6 +148,15 @@
%description doc
MPlayer documentation in various languages.
+%package tools
+Summary: Useful scripts for MPlayer
+Group: Applications/Multimedia
+Requires: mencoder = %{version}-%{release}
+Requires: mplayer = %{version}-%{release}
+
+%description tools
+This package contains various scripts from MPlayer TOOLS directory.
+
%define mp_configure \
./configure \\\
--prefix=%{_prefix} \\\
@@ -152,6 +174,8 @@
--enable-largefiles \\\
--enable-lirc \\\
--enable-menu \\\
+ --enable-radio \\\
+ --enable-radio-capture \\\
--enable-runtime-cpudetection \\\
--enable-unrarexec \\\
\\\
@@ -166,6 +190,7 @@
\\\
--disable-liba52-internal \\\
%{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\
+ %{!?_with_faac:--disable-faac} \\\
--disable-faad-internal \\\
%{!?_with_libmad:--disable-mad} \\\
--disable-tremor-internal \\\
@@ -210,7 +235,7 @@
%build
pushd GUI
-%{mp_configure}--enable-gui --disable-mencoder
+%{mp_configure}--enable-gui
%{__make} %{?_smp_mflags}
popd
@@ -230,10 +255,21 @@
rm -rf $RPM_BUILD_ROOT doc
make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no
-for file in aconvert.sh midentify.sh ; do
+for file in aconvert.sh divx2svcd.sh mencvcd.sh midentify.sh mpconsole.sh qepdvcd.sh subsearch.sh ; do
install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .sh`
done
+for file in calcbpp.pl countquant.pl dvd2divxscript.pl ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .pl`
+done
+
+for file in vobshift.py ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .py`
+done
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mplayer
+install -pm 644 TOOLS/*.fp $RPM_BUILD_ROOT%{_datadir}/mplayer/
+
# Clean up documentation
mkdir doc
cp -pR DOCS/* doc/
@@ -286,13 +322,15 @@
%files
%defattr(-, root, root, -)
+%{_bindir}/mplayer
+
+%files common
+%defattr(-, root, root, -)
%doc AUTHORS Changelog Copyright LICENSE README
%dir %{_sysconfdir}/mplayer
%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
%config(noreplace) %{_sysconfdir}/mplayer/input.conf
%config(noreplace) %{_sysconfdir}/mplayer/menu.conf
-%{_bindir}/midentify
-%{_bindir}/mplayer
%dir %{codecdir}/
%dir %{_datadir}/mplayer/
%{_mandir}/man1/mplayer.1*
@@ -315,7 +353,6 @@
%files -n mencoder
%defattr(-, root, root, -)
-%{_bindir}/aconvert
%{_bindir}/mencoder
%{_mandir}/man1/mencoder.1*
%lang(cs) %{_mandir}/cs/man1/mencoder.1*
@@ -340,8 +377,32 @@
%lang(ru) %doc doc/ru/
%lang(zh_CN) %doc doc/zh_CN/
+%files tools
+%defattr(-, root, root, -)
+%{_bindir}/aconvert
+%{_bindir}/calcbpp
+%{_bindir}/countquant
+%{_bindir}/divx2svcd
+%{_bindir}/dvd2divxscript
+%{_bindir}/mencvcd
+%{_bindir}/midentify
+%{_bindir}/mpconsole
+%{_bindir}/qepdvcd
+%{_bindir}/subsearch
+%{_bindir}/vobshift
+%{_datadir}/mplayer/*.fp
%changelog
+* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.112.20100116svn
+- 20100116 snapshot
+- rebuild against current x264
+- fix licence tag when compiled with OpenCore AMR
+- fix build --with faac (bug #997)
+- enable radio support (bug #634)
+- openal-devel is now openal-soft-devel (bug #935)
+- move some files to -common subpackage, adjust dependencies (bug #1037)
+- introduce -tools subpackage, move scripts there (bugs #544, #1037)
+
* Thu Oct 29 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.111.20091029svn
- 20091029 snapshot
- rebuild against current x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 30 Oct 2009 01:10:22 -0000 1.15
+++ sources 17 Jan 2010 03:31:18 -0000 1.16
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-101e633734544dfc735ea27d218342eb mplayer-export-2009-10-29.tar.bz2
+a945a0c0248ebcbfbd72af0975bd46a8 mplayer-export-2010-01-16.tar.bz2
14 years, 3 months
rpms/gpac/devel gpac-0.4.6-ffmpeg.patch, 1.1, 1.2 gpac.spec, 1.12, 1.13 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 gpac-0.4.6-libxml2.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24512
Modified Files:
gpac-0.4.6-ffmpeg.patch gpac.spec .cvsignore sources
Removed Files:
gpac-0.4.6-libxml2.patch
Log Message:
- Update to 20100116
- Removed upstreamed patch for system libxml2
- Update ffmpeg patch
gpac-0.4.6-ffmpeg.patch:
configure | 19 ++++++++++++++++---
modules/ffmpeg_in/Makefile | 6 ++----
2 files changed, 18 insertions(+), 7 deletions(-)
Index: gpac-0.4.6-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac-0.4.6-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.6-ffmpeg.patch 19 Sep 2009 12:08:42 -0000 1.1
+++ gpac-0.4.6-ffmpeg.patch 17 Jan 2010 00:43:58 -0000 1.2
@@ -1,49 +1,43 @@
diff -up gpac/configure.ffmpeg gpac/configure
---- gpac/configure.ffmpeg 2009-09-01 16:50:50.270496559 +0200
-+++ gpac/configure 2009-09-01 17:59:05.902493824 +0200
-@@ -808,25 +808,19 @@ cat > $TMPC << EOF
+--- gpac/configure.ffmpeg 2010-01-16 19:09:26.451865570 +0100
++++ gpac/configure 2010-01-16 19:19:49.604861370 +0100
+@@ -852,12 +852,21 @@ fi
+
+ #look for FFMPEG support
+
++if pkg-config --exists libavcodec libavformat libswscale 2> /dev/null ; then
++ ffmpeg_cflags=`pkg-config --cflags libavcodec libavformat libswscale libavutil`
++ ffmpeg_lflags=`pkg-config --libs libavcodec libavformat libswscale libavutil`
++ has_ffmpeg="system"
++else
++ ffmpeg_cflags=``
++ ffmpeg_lflags=`-lz -lavcodec -lavformat`
++fi
++
+ cat > $TMPC << EOF
+ #include <libavcodec/avcodec.h>
int main( void ) { return 0; }
EOF
-if $cc $TMPO -c $TMPC 2> /dev/null ; then
--old_ffmpeg_inc="no"
-+if pkg-config --exists libavcodec libavformat libswscale 2> /dev/null ; then
-+ ffmpeg_cflags=`pkg-config --cflags libavcodec libavformat libswscale`
-+ ffmpeg_lflags=`pkg-config --libs libavcodec libavformat libswscale`
-+ has_ffmpeg="system"
++if $cc $TMPO $ffmpeg_cflags -c $TMPC 2> /dev/null ; then
+ old_ffmpeg_inc="no"
else
--
--old_ffmpeg_inc="yes"
--
--cat > $TMPC << EOF
--#include <ffmpeg/avcodec.h>
--int main( void ) { return 0; }
--EOF
--
--fi
--
-+ ffmpeg_cflags=
-+ ffmpeg_lflags=`-lavcodec -lavformat`
+
+@@ -872,10 +881,10 @@ fi
+
if test "$cross_prefix" != "" ; then
- if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib -lz -lavcodec -lavformat -lavutil 2> /dev/null ; then
-+ if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib -lz $ffmpeg_lflags -lavutil 2> /dev/null ; then
++ if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null ; then
has_ffmpeg="system"
else
- if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -lz -lavcodec -lavformat 2> /dev/null ; then
-+ if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -lz $ffmpeg_lflags 2> /dev/null ; then
++ if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null ; then
has_ffmpeg="local"
+ echo OK
fi
- fi
-@@ -841,6 +835,7 @@ else
- has_ffmpeg="local"
- fi
- fi
-+fi
-
- #look for vorbis support
- cat > $TMPC << EOF
-@@ -1912,6 +1907,10 @@ echo "CONFIG_VORBIS=$has_vorbis" >> conf
+@@ -1978,6 +1987,10 @@ echo "CONFIG_VORBIS=$has_vorbis" >> conf
echo "CONFIG_THEORA=$has_theora" >> config.mak
echo "CONFIG_FFMPEG=$has_ffmpeg" >> config.mak
echo "CONFIG_FFMPEG_OLD=$old_ffmpeg_inc" >> config.mak
@@ -56,7 +50,7 @@
echo "CONFIG_ALSA=$has_alsa" >> config.mak
diff -up gpac/modules/ffmpeg_in/Makefile.ffmpeg gpac/modules/ffmpeg_in/Makefile
--- gpac/modules/ffmpeg_in/Makefile.ffmpeg 2009-07-31 09:37:41.000000000 +0200
-+++ gpac/modules/ffmpeg_in/Makefile 2009-09-01 17:49:55.333497907 +0200
++++ gpac/modules/ffmpeg_in/Makefile 2010-01-16 19:09:26.460862249 +0100
@@ -2,7 +2,7 @@ include ../../config.mak
vpath %.c $(SRC_PATH)/modules/ffmpeg_in
@@ -71,7 +65,7 @@
LOCAL_LIB=
-LINKLIBS=-lgpac -lavcodec -lavformat -lz
-+LINKLIBS=-lgpac $(FFMPEG_LFLAGS) -lz
++LINKLIBS=-lgpac -lz $(FFMPEG_LFLAGS)
#old ffmpeg lib
ifeq ($(CONFIG_FFMPEG_OLD), yes)
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gpac.spec 3 Nov 2009 22:42:58 -0000 1.12
+++ gpac.spec 17 Jan 2010 00:43:58 -0000 1.13
@@ -7,7 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%global osmo Osmo4
-%global cvs 20090919
+%global cvs 20100116
%global with_osmo 0
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
@@ -18,7 +18,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
-Release: 0.2.cvs%{?cvs}%{?dist}
+Release: 0.3.cvs%{?cvs}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -32,9 +32,6 @@
Patch3: gpac-0.4.5-lib64.patch
Patch4: gpac-0.4.5-system_openjpeg.patch
Patch5: gpac-0.4.6-js_cflags.patch
-Patch6: gpac-0.4.5-shared_sggen.patch
-#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853856&group_id=84101
-Patch7: gpac-0.4.6-libxml2.patch
#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101
Patch9: gpac-0.4.6-ffmpeg.patch
Patch10: gpac-0.4.6-ogl_libs.patch
@@ -159,8 +156,6 @@
%endif
%patch4 -p1 -b .openjpeg
%patch5 -p1 -b .jscflags
-%patch6 -p1 -b .shared
-%patch7 -p1 -b .libxml2
%patch9 -p1 -b .ffmpeg
%patch10 -p1 -b .ogl_libs
@@ -337,6 +332,11 @@
%changelog
+* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0.4.6-0.3cvs20100116
+- Update to 20100116
+- Removed upstreamed patch for system libxml2
+- Update ffmpeg patch
+
* Tue Nov 3 2009 kwizart < kwizart at gmail.com > - 0.4.6-0.2cvs20090919
- Attempt to fix rfbz#270
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 19 Sep 2009 12:08:42 -0000 1.4
+++ .cvsignore 17 Jan 2010 00:43:58 -0000 1.5
@@ -1 +1 @@
-gpac-20090919.tar.bz2
+gpac-20100116.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 Sep 2009 12:08:42 -0000 1.4
+++ sources 17 Jan 2010 00:43:58 -0000 1.5
@@ -1 +1 @@
-3211533978e01971f9817ae844536d76 gpac-20090919.tar.bz2
+6090746dc1e63b30186029acd390d6cb gpac-20100116.tar.bz2
--- gpac-0.4.6-libxml2.patch DELETED ---
14 years, 3 months
rpms/mplayer/devel mplayer.spec,1.24,1.25
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9057
Modified Files:
mplayer.spec
Log Message:
cosmetics
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mplayer.spec 30 Oct 2009 01:10:22 -0000 1.24
+++ mplayer.spec 16 Jan 2010 21:30:10 -0000 1.25
@@ -193,11 +193,10 @@
%setup -q -n MPlayer-%{version}%{pre}
%endif
%patch2 -p1 -b .config
-
-
%patch8 -p1 -b .manlinks
%patch10 -p1 -b .qcelp
%patch14 -p1 -b .nodvdcss
+
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1
14 years, 3 months
rpms/alsa-plugins-freeworld/F-12 .cvsignore, 1.3, 1.4 alsa-plugins-freeworld.spec, 1.2, 1.3 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/alsa-plugins-freeworld/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23367/F-12
Modified Files:
.cvsignore alsa-plugins-freeworld.spec sources
Log Message:
- Update to 1.0.22
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Sep 2009 22:43:22 -0000 1.3
+++ .cvsignore 16 Jan 2010 17:28:25 -0000 1.4
@@ -1 +1 @@
-alsa-plugins-1.0.21.tar.bz2
+alsa-plugins-1.0.22.tar.bz2
Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-12/alsa-plugins-freeworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-plugins-freeworld.spec 8 Sep 2009 22:43:22 -0000 1.2
+++ alsa-plugins-freeworld.spec 16 Jan 2010 17:28:25 -0000 1.3
@@ -1,5 +1,5 @@
Name: alsa-plugins-freeworld
-Version: 1.0.21
+Version: 1.0.22
Release: 1%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
@@ -105,6 +105,9 @@
%changelog
+* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0.22-1
+- Update to 1.0.22
+
* Wed Sep 9 2009 kwizart < kwizart at gmail > - 1.0.21-1
- Update to 1.0.21
Index: sources
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Sep 2009 22:43:22 -0000 1.3
+++ sources 16 Jan 2010 17:28:25 -0000 1.4
@@ -1 +1 @@
-392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2
+a482cce4007b7c75e1c0a677f7f0fe07 alsa-plugins-1.0.22.tar.bz2
14 years, 3 months
rpms/alsa-plugins-freeworld/devel .cvsignore, 1.3, 1.4 alsa-plugins-freeworld.spec, 1.2, 1.3 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/alsa-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23367/devel
Modified Files:
.cvsignore alsa-plugins-freeworld.spec sources
Log Message:
- Update to 1.0.22
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Sep 2009 22:43:22 -0000 1.3
+++ .cvsignore 16 Jan 2010 17:28:24 -0000 1.4
@@ -1 +1 @@
-alsa-plugins-1.0.21.tar.bz2
+alsa-plugins-1.0.22.tar.bz2
Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/alsa-plugins-freeworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-plugins-freeworld.spec 8 Sep 2009 22:43:22 -0000 1.2
+++ alsa-plugins-freeworld.spec 16 Jan 2010 17:28:24 -0000 1.3
@@ -1,5 +1,5 @@
Name: alsa-plugins-freeworld
-Version: 1.0.21
+Version: 1.0.22
Release: 1%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
@@ -105,6 +105,9 @@
%changelog
+* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0.22-1
+- Update to 1.0.22
+
* Wed Sep 9 2009 kwizart < kwizart at gmail > - 1.0.21-1
- Update to 1.0.21
Index: sources
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Sep 2009 22:43:22 -0000 1.3
+++ sources 16 Jan 2010 17:28:24 -0000 1.4
@@ -1 +1 @@
-392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2
+a482cce4007b7c75e1c0a677f7f0fe07 alsa-plugins-1.0.22.tar.bz2
14 years, 3 months
rpms/alsa-plugins-freeworld/F-11 .cvsignore, 1.2, 1.3 alsa-plugins-freeworld.spec, 1.2, 1.3 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/alsa-plugins-freeworld/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23367/F-11
Modified Files:
.cvsignore alsa-plugins-freeworld.spec sources
Log Message:
- Update to 1.0.22
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 29 Aug 2009 17:14:31 -0000 1.2
+++ .cvsignore 16 Jan 2010 17:28:25 -0000 1.3
@@ -1 +1 @@
-alsa-plugins-1.0.20.tar.bz2
+alsa-plugins-1.0.22.tar.bz2
Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-11/alsa-plugins-freeworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-plugins-freeworld.spec 8 Sep 2009 22:43:23 -0000 1.2
+++ alsa-plugins-freeworld.spec 16 Jan 2010 17:28:25 -0000 1.3
@@ -1,5 +1,5 @@
Name: alsa-plugins-freeworld
-Version: 1.0.21
+Version: 1.0.22
Release: 1%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
@@ -105,6 +105,9 @@
%changelog
+* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0.22-1
+- Update to 1.0.22
+
* Wed Sep 9 2009 kwizart < kwizart at gmail > - 1.0.21-1
- Update to 1.0.21
Index: sources
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Sep 2009 22:43:23 -0000 1.3
+++ sources 16 Jan 2010 17:28:25 -0000 1.4
@@ -1 +1 @@
-392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2
+a482cce4007b7c75e1c0a677f7f0fe07 alsa-plugins-1.0.22.tar.bz2
14 years, 3 months
rpms/ffmpeg/devel .cvsignore, 1.12, 1.13 ffmpeg-snapshot.sh, 1.5, 1.6 ffmpeg-textrel.patch, 1.1, 1.2 ffmpeg.spec, 1.24, 1.25 sources, 1.12, 1.13 ffmpeg-ppc-pic.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22680
Modified Files:
.cvsignore ffmpeg-snapshot.sh ffmpeg-textrel.patch ffmpeg.spec
sources
Removed Files:
ffmpeg-ppc-pic.patch
Log Message:
* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.5-6.20100116svn
- 20100116 snapshot, requires recent x264
- fix textrels on x86_64 in a different way (patch by Reimar Döffinger)
- use -mlongcall instead of -fPIC to fix rfbz#804, it's faster
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 27 Oct 2009 00:38:30 -0000 1.12
+++ .cvsignore 16 Jan 2010 17:20:07 -0000 1.13
@@ -1 +1 @@
-ffmpeg-20091026.tar.bz2
+ffmpeg-20100116.tar.bz2
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-snapshot.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ffmpeg-snapshot.sh 22 Oct 2009 15:14:52 -0000 1.5
+++ ffmpeg-snapshot.sh 16 Jan 2010 17:20:07 -0000 1.6
@@ -12,18 +12,19 @@
unset CDPATH
pwd=$(pwd)
-svn=$(date +%Y%m%d)
-svn=20091019
+date=$(date +%Y%m%d)
+svn={$date}
+svn=HEAD
cd "$tmp"
-svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
-cd ffmpeg-$svn
+svn checkout -r $svn svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$date
+cd ffmpeg-$date
pushd libswscale
-svn update -r {$svn} libswscale
+svn update -r $svn libswscale
popd
./version.sh . version.h
find . -type d -name .svn -print0 | xargs -0r rm -rf
sed -i -e '/^\.PHONY: version\.h$/d' Makefile
cd ..
-tar jcf "$pwd"/ffmpeg-$svn.tar.bz2 ffmpeg-$svn
+tar jcf "$pwd"/ffmpeg-$date.tar.bz2 ffmpeg-$date
cd - >/dev/null
ffmpeg-textrel.patch:
fft_mmx.asm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
Index: ffmpeg-textrel.patch
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-textrel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-textrel.patch 10 Mar 2009 23:25:59 -0000 1.1
+++ ffmpeg-textrel.patch 16 Jan 2010 17:20:07 -0000 1.2
@@ -1,12 +1,41 @@
-diff -up ffmpeg-0.5/libavcodec/x86/fft_mmx.asm.textrel ffmpeg-0.5/libavcodec/x86/fft_mmx.asm
---- ffmpeg-0.5/libavcodec/x86/fft_mmx.asm.textrel 2009-02-13 01:57:22.000000000 +0100
-+++ ffmpeg-0.5/libavcodec/x86/fft_mmx.asm 2009-03-10 22:09:16.000000000 +0100
-@@ -448,6 +448,8 @@ fft %+ n %+ %3%2:
+diff -up ffmpeg-20100116/libavcodec/x86/fft_mmx.asm.textrel ffmpeg-20100116/libavcodec/x86/fft_mmx.asm
+--- ffmpeg-20100116/libavcodec/x86/fft_mmx.asm.textrel 2010-01-16 14:24:37.000000000 +0100
++++ ffmpeg-20100116/libavcodec/x86/fft_mmx.asm 2010-01-16 15:36:17.000000000 +0100
+@@ -419,18 +419,23 @@ DECL_PASS pass_interleave_3dn, PASS_BIG
+ %define pass_3dn2 pass_3dn
+ %define pass_interleave_3dn2 pass_interleave_3dn
- %ifidn __OUTPUT_FORMAT__,macho64
- section .rodata
++%ifdef PIC
++%define SECTION_REL - $$
+%else
-+section .data
++%define SECTION_REL
++%endif
+
+ %macro DECL_FFT 2-3 ; nbits, cpu, suffix
+-%xdefine list_of_fft fft4%2, fft8%2
++%xdefine list_of_fft fft4%2 SECTION_REL, fft8%2 SECTION_REL
+ %if %1==5
+-%xdefine list_of_fft list_of_fft, fft16%2
++%xdefine list_of_fft list_of_fft, fft16%2 SECTION_REL
%endif
- align 8
+ %assign n 1<<%1
+ %rep 17-%1
+ %assign n2 n/2
+ %assign n4 n/4
+-%xdefine list_of_fft list_of_fft, fft %+ n %+ %3%2
++%xdefine list_of_fft list_of_fft, fft %+ n %+ %3%2 SECTION_REL
+
+ align 16
+ fft %+ n %+ %3%2:
+@@ -462,6 +467,10 @@ section .text
+ cglobal fft_dispatch%3%2, 2,5,8, z, nbits
+ lea r2, [dispatch_tab%3%2 GLOBAL]
+ mov r2, [r2 + (nbitsq-2)*gprsize]
++%ifdef PIC
++ lea r3, [$$ GLOBAL]
++ add r2, r3
++%endif
+ call r2
+ RET
+ %endmacro ; DECL_FFT
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ffmpeg.spec 7 Nov 2009 15:34:58 -0000 1.24
+++ ffmpeg.spec 16 Jan 2010 17:20:07 -0000 1.25
@@ -1,12 +1,12 @@
# TODO: add make test to %%check section
-%global svn 20091026
+%global svn 20100116
%global faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.5
-Release: 5.%{svn}svn%{?dist}
+Release: 6.%{svn}svn%{?dist}
%if 0%{?_with_opencore_amr:1}
License: GPLv3+
%else
@@ -18,8 +18,6 @@
Source1: ffmpeg-snapshot.sh
# get rid of textrels on x86_64 in yasm code
Patch0: %{name}-textrel.patch
-# compile with -fPIC on ppc/ppc64 (rf804)
-Patch1: %{name}-ppc-pic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel
@@ -40,7 +38,7 @@
BuildRequires: SDL-devel
BuildRequires: speex-devel
BuildRequires: texi2html
-BuildRequires: x264-devel >= 0.0.0-0.26.20091026
+BuildRequires: x264-devel >= 0.0.0-0.27
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -122,9 +120,12 @@
%prep
%setup -q -n %{name}-%{svn}
%patch0 -p1 -b .textrel
-%patch1 -p1 -b .ppc-pic
%build
+%ifarch ppc ppc64
+# compile with -mlongcall on ppc/ppc64 (rf804)
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
+%endif
mkdir generic
pushd generic
%{ff_configure}\
@@ -227,6 +228,11 @@
%changelog
+* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.5-6.20100116svn
+- 20100116 snapshot, requires recent x264
+- fix textrels on x86_64 in a different way (patch by Reimar Döffinger)
+- use -mlongcall instead of -fPIC to fix rfbz#804, it's faster
+
* Sat Nov 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.5-5.20091026svn
- Add -fPIC -dPIC when compiling on ppc (rf804)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 27 Oct 2009 00:38:30 -0000 1.12
+++ sources 16 Jan 2010 17:20:07 -0000 1.13
@@ -1 +1 @@
-d58be64ecdae72a659344133c50b7c1d ffmpeg-20091026.tar.bz2
+97e2c04175c6613810399ce65c4c3914 ffmpeg-20100116.tar.bz2
--- ffmpeg-ppc-pic.patch DELETED ---
14 years, 3 months
rpms/libquicktime/devel libquicktime.spec,1.14,1.15
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22255
Modified Files:
libquicktime.spec
Log Message:
-Remove deprecated mmx configure option
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libquicktime.spec 16 Jan 2010 16:43:22 -0000 1.14
+++ libquicktime.spec 16 Jan 2010 17:11:57 -0000 1.15
@@ -68,12 +68,7 @@
--without-doxygen \
--disable-static \
--with-libdv \
- --enable-libswscale \
-%ifarch i686 pentium3 pentium4 athlon x86_64 ia64
- --enable-mmx \
-%else
- --disable-mmx
-%endif
+ --enable-libswscale
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
14 years, 3 months
rpms/libquicktime/devel libquicktime.spec, 1.13, 1.14 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 libquicktime-1.1.3-x264_b78.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20139
Modified Files:
libquicktime.spec .cvsignore sources
Removed Files:
libquicktime-1.1.3-x264_b78.patch
Log Message:
Update to 1.1.4
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libquicktime.spec 30 Oct 2009 07:38:01 -0000 1.13
+++ libquicktime.spec 16 Jan 2010 16:43:22 -0000 1.14
@@ -1,12 +1,11 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
-Version: 1.1.3
-Release: 3%{?dist}
+Version: 1.1.4
+Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
-Patch0: libquicktime-1.1.3-x264_b78.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel
@@ -56,7 +55,7 @@
%prep
%setup -q
-%patch0 -p1 -b .b78
+
# --------------------------------------------------------------------
@@ -135,6 +134,9 @@
# --------------------------------------------------------------------
%changelog
+* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.1.4-1
+- Update to 1.1.4
+
* Fri Oct 30 2009 kwizart <kwizart at gmail.com > - 1.1.3-3
- Add BR schroedinger-devel
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 7 Oct 2009 22:55:30 -0000 1.5
+++ .cvsignore 16 Jan 2010 16:43:22 -0000 1.6
@@ -1 +1 @@
-libquicktime-1.1.3.tar.gz
+libquicktime-1.1.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 7 Oct 2009 22:55:30 -0000 1.5
+++ sources 16 Jan 2010 16:43:22 -0000 1.6
@@ -1 +1 @@
-e4fcda219f1e0ca508d9baa3700e4a59 libquicktime-1.1.3.tar.gz
+ee4f8602e67a445ba906f809a83e0c34 libquicktime-1.1.4.tar.gz
--- libquicktime-1.1.3-x264_b78.patch DELETED ---
14 years, 3 months
rpms/live555/devel live555.spec,1.7,1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/live555/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18705
Modified Files:
live555.spec
Log Message:
Fix typo
Index: live555.spec
===================================================================
RCS file: /cvs/free/rpms/live555/devel/live555.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- live555.spec 16 Jan 2010 16:22:01 -0000 1.7
+++ live555.spec 16 Jan 2010 16:22:57 -0000 1.8
@@ -171,7 +171,7 @@
%{_libdir}/libUsageEnvironment*.a
%changelog
-* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraprojec.org> - 0-0.25.2010.01.16
+* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0-0.25.2010.01.16
- Update to 2010.01.16
- Update patch for shared library
14 years, 3 months