rpms/mplayer/devel mplayer-config.patch, NONE, 1.1 mplayer-manlinks.patch, NONE, 1.1 mplayer-qcelp.patch, NONE, 1.1 mplayer-x86_32-compile.patch, NONE, 1.1 mplayer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28948
Modified Files:
.cvsignore sources
Added Files:
mplayer-config.patch mplayer-manlinks.patch
mplayer-qcelp.patch mplayer-x86_32-compile.patch mplayer.spec
Log Message:
initial import from livna
mplayer-config.patch:
--- NEW FILE mplayer-config.patch ---
--- etc/example.conf~ 2006-06-11 21:35:46.000000000 +0300
+++ etc/example.conf 2006-08-10 01:18:25.000000000 +0300
@@ -3,3 +3,3 @@
#
-# Configuration files are read system-wide from /usr/local/etc/mplayer.conf
+# Configuration files are read system-wide from /etc/mplayer/mplayer.conf
# and per user from ~/.mplayer/config, where per-user settings override
@@ -93,3 +93,3 @@
# Specify your preferred skin here (skins are searched for in
-# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
+# /usr/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
#skin = Abyss
@@ -120,4 +120,9 @@
+# A plugged in joystick can interfere with keyboard shortcuts
+joystick = no
+
+# FriBidi can do "funny" things to some ISO-8859-* subtitles
+flip-hebrew = no
# You can also include other configuration files.
-#include = /path/to/the/file/you/want/to/include
+#include = /home/me/.mplayer/something
mplayer-manlinks.patch:
--- NEW FILE mplayer-manlinks.patch ---
diff -up mplayer-export-2008-06-04/Makefile.manlinks mplayer-export-2008-06-04/Makefile
--- mplayer-export-2008-06-04/Makefile.manlinks 2008-05-30 22:10:36.000000000 +0200
+++ mplayer-export-2008-06-04/Makefile 2008-06-04 23:13:37.000000000 +0200
@@ -805,7 +805,7 @@ install-mplayer-man-en:
$(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/
install-mencoder-man-en: install-mplayer-man-en
- cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
+ echo ".so mplayer.1" > $(MANDIR)/man1/mencoder.1
define MPLAYER_MAN_RULE
install-mplayer-man-$(lang):
@@ -815,7 +815,7 @@ endef
define MENCODER_MAN_RULE
install-mencoder-man-$(lang): install-mplayer-man-$(lang)
- cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
+ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/mencoder.1
endef
$(foreach lang,$(MAN_LANG),$(eval $(MPLAYER_MAN_RULE)))
mplayer-qcelp.patch:
--- NEW FILE mplayer-qcelp.patch ---
diff -up mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c
--- mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp 2008-01-13 17:00:39.000000000 +0100
+++ mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c 2008-02-22 21:19:57.000000000 +0100
@@ -40,6 +40,7 @@ MIMEto4CC supported_audio[NMS_MAX_FORMAT
{"MPA", 0x55},
{"vorbis", mmioFOURCC('v','r','b','s')},
{"mpeg4-generic", mmioFOURCC('M','P','4','A')},
+ {"x-Purevoice", mmioFOURCC('Q','c','l','p')},
{NULL, 0},
};
mplayer-x86_32-compile.patch:
--- NEW FILE mplayer-x86_32-compile.patch ---
diff -up mplayer-export-2008-05-31/libavcodec/Makefile.compile mplayer-export-2008-05-31/libavcodec/Makefile
--- mplayer-export-2008-05-31/libavcodec/Makefile.compile 2008-05-31 16:32:11.000000000 +0200
+++ mplayer-export-2008-05-31/libavcodec/Makefile 2008-06-11 07:47:18.000000000 +0200
@@ -91,6 +91,11 @@ OBJS-$(CONFIG_H263I_DECODER) +
OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o golomb.o mpegvideo.o error_resilience.o
+# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm'
+# on ix86 in cabac.h
+ifeq ($(ARCH_X86_32),yes)
+h264.o: CFLAGS += -fomit-frame-pointer
+endif
OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
@@ -395,6 +400,11 @@ OBJS-$(CONFIG_ENCODERS) +
OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o
OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o
OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o
+# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm'
+# on ix86 in snowdsp_mmx.o
+ifeq ($(ARCH_X86_32),yes)
+i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
+endif
OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o
OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
--- NEW FILE mplayer.spec ---
%define codecdir %{_libdir}/codecs
%define pre 20080613svn
%define svn 1
%define svnbuild 2008-06-13
%define svnrev 27055
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
Release: 0.95.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mplayerhq.hu/
%if %{svn}
Source0: http://rpm.greysector.net/livna/mplayer-export-%{svnbuild}.tar.bz2
%else
Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre}.tar.bz2
%endif
Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
Patch2: %{name}-config.patch
Patch5: %{name}-x86_32-compile.patch
Patch8: %{name}-manlinks.patch
Patch10: %{name}-qcelp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
BuildRequires: cdparanoia-devel
BuildRequires: desktop-file-utils
BuildRequires: em8300-devel
BuildRequires: enca-devel
BuildRequires: faac-devel
BuildRequires: faad2 >= %{faad2min}
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.9
BuildRequires: fribidi-devel
BuildRequires: giflib-devel
BuildRequires: gtk2-devel
BuildRequires: ladspa-devel
BuildRequires: lame-devel
BuildRequires: libGL-devel
BuildRequires: libXinerama-devel
BuildRequires: libXv-devel
BuildRequires: libXvMC-devel
BuildRequires: libXxf86dga-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libcaca-devel
BuildRequires: libdca-devel
BuildRequires: libdv-devel
BuildRequires: libdvdnav-devel >= 4.1.3
BuildRequires: libjpeg-devel
BuildRequires: libmpcdec-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: lirc-devel
BuildRequires: live-devel
BuildRequires: lzo-devel >= 2
BuildRequires: pulseaudio-lib-devel
BuildRequires: speex-devel >= 1.1
BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.14.20080613
BuildRequires: xvidcore-devel >= 0.9.2
%{?_with_arts:BuildRequires: arts-devel}
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
%{?_with_directfb:BuildRequires: directfb-devel}
%{?_with_esound:BuildRequires: esound-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_samba:BuildRequires: libsmbclient-devel}
%{?_with_svgalib:BuildRequires: svgalib-devel}
%{?_with_xmms:BuildRequires: xmms-devel}
%if %{svn}
# for XML docs, SVN only
BuildRequires: docbook-dtds
BuildRequires: docbook-style-xsl
BuildRequires: libxml2
BuildRequires: libxslt
%endif
Obsoletes: mplayer-fonts
Requires: faad2-libs >= %{faad2min}
%description
MPlayer is a movie player that plays most MPEG, VOB, AVI, OGG/OGM,
VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM,
RoQ, and PVA files. You can also use it to watch VCDs, SVCDs, DVDs,
3ivx, RealMedia, and DivX movies.
It supports a wide range of output drivers including X11, XVideo, DGA,
OpenGL, SVGAlib, fbdev, AAlib, DirectFB etc. There are also nice
antialiased shaded subtitles and OSD.
Non-default rpmbuild options:
--with samba: Enable Samba (smb://) support
--with xmms: Enable XMMS input plugin support
--with amr: Enable AMR support
--with libmad: Enable libmad support
--with openal: Enable OpenAL support
--with jack: Enable JACK support
--with arts: Enable aRts support
--with esound: Enable EsounD support
--with directfb:Enable DirectFB support
--with svgalib: Enable SVGAlib support
--with nemesi: Enable libnemesi RTSP support
%package gui
Summary: GUI for MPlayer
Group: Applications/Multimedia
Requires: mplayer = %{version}-%{release}
%description gui
This package contains a GUI for MPlayer and a default skin for it.
%package -n mencoder
Summary: MPlayer movie encoder
Group: Applications/Multimedia
Requires: mplayer = %{version}-%{release}
Provides: mplayer-mencoder = %{version}-%{release}
Obsoletes: mplayer-mencoder < 1.0-0.36
%description -n mencoder
This package contains the MPlayer movie encoder.
%package doc
Summary: MPlayer documentation in various languages
Group: Documentation
%description doc
MPlayer documentation in various languages.
%prep
%if %{svn}
%setup -q -n mplayer-export-%{svnbuild}
%else
%setup -q -n MPlayer-%{version}%{pre}
%endif
%patch2 -p0
%patch5 -p1 -b .compile
%patch8 -p1 -b .manlinks
%patch10 -p1 -b .qclp
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
}
for lang in de es fr it ; do doconv iso-8859-1 utf-8 $lang ; done
for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done
for lang in ru ; do doconv koi8-r utf-8 $lang ; done
mv DOCS/man/zh DOCS/man/zh_CN
sed -i -e 's/\(SVN-r[0-9]* \)/\1rpm.livna.org /' -e 's/UNKNOWN/%{svnrev}/' version.sh
%build
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
%ifarch ppc
export CFLAGS="$CFLAGS -maltivec -mabi=altivec"
%endif
./configure \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
--datadir=%{_datadir}/mplayer \
--mandir=%{_mandir} \
--confdir=%{_sysconfdir}/mplayer \
--libdir=%{_libdir} \
--codecsdir=%{codecdir} \
\
--disable-encoder=FAAC \
--disable-encoder=MP3LAME \
--disable-encoder=X264 \
\
--enable-gui \
--enable-largefiles \
--enable-unrarexec \
--disable-termcap \
--disable-bitmap-font \
--enable-lirc \
--enable-joystick \
%{!?_with_nemesi:--disable-nemesi} \
%{!?_with_samba:--disable-smb} \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--enable-menu \
\
--disable-faad-internal \
--disable-tremor-internal \
%{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \
%{!?_with_libmad:--disable-mad} \
%{?_with_xmms:--enable-xmms} \
\
--enable-xvmc \
--%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \
%{!?_with_svgalib:--disable-svga} \
\
%{!?_with_arts:--disable-arts} \
%{!?_with_esound:--disable-esd} \
%{!?_with_jack:--disable-jack} \
%{!?_with_openal:--disable-openal} \
\
--enable-runtime-cpudetection \
--target=%{_target_cpu}-%{_target_os} \
--language=all \
\
--with-fribidi-config="pkg-config fribidi" \
%{?_with_xmms:--with-xmmslibdir=%{_libdir}} \
--with-xvmclib=XvMCW
%{__make} %{?_smp_mflags}
mv -f mplayer gmplayer
%{__make} distclean
./configure \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
--datadir=%{_datadir}/mplayer \
--mandir=%{_mandir} \
--confdir=%{_sysconfdir}/mplayer \
--libdir=%{_libdir} \
--codecsdir=%{codecdir} \
\
--disable-encoder=FAAC \
--disable-encoder=MP3LAME \
--disable-encoder=X264 \
\
--enable-largefiles \
--enable-unrarexec \
--disable-termcap \
--disable-bitmap-font \
--enable-lirc \
--enable-joystick \
%{!?_with_nemesi:--disable-nemesi} \
%{!?_with_samba:--disable-smb} \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--enable-menu \
\
--disable-faad-internal \
--disable-tremor-internal \
%{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \
%{!?_with_libmad:--disable-mad} \
%{?_with_xmms:--enable-xmms} \
\
--enable-xvmc \
--%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \
%{!?_with_svgalib:--disable-svga} \
\
%{!?_with_arts:--disable-arts} \
%{!?_with_esound:--disable-esd} \
%{!?_with_jack:--disable-jack} \
%{!?_with_openal:--disable-openal} \
\
--enable-runtime-cpudetection \
--target=%{_target_cpu}-%{_target_os} \
--language=all \
\
--with-fribidi-config="pkg-config fribidi" \
%{?_with_xmms:--with-xmmslibdir=%{_libdir}} \
--with-xvmclib=XvMCW
%{__make} %{?_smp_mflags}
%if %{svn}
# build HTML documentation from XML files
pushd DOCS/xml
%{__make} html-chunked
popd
%endif
%install
rm -rf $RPM_BUILD_ROOT doc
make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no
install -pm 755 TOOLS/midentify $RPM_BUILD_ROOT%{_bindir}/
# Clean up documentation
mkdir doc
cp -pR DOCS/* doc/
rm -r doc/man doc/xml doc/README
mv doc/HTML/* doc/
rm -rf doc/HTML
# Default config files
install -Dpm 644 etc/example.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf
# use Nimbus Sans L font for OSD (via fontconfig)
echo "fontconfig=yes" >>$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf
echo "font=\"Sans\"" >>$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf
echo "ao=pulse,alsa," >>$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf
install -pm 644 etc/{input,menu}.conf $RPM_BUILD_ROOT%{_sysconfdir}/mplayer/
# GUI mplayer
install -pm 755 g%{name} $RPM_BUILD_ROOT%{_bindir}/
# Default skin
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/mplayer/skins
tar xjC $RPM_BUILD_ROOT%{_datadir}/mplayer/skins --exclude=.svn -f %{SOURCE1}
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
# Desktop file
desktop-file-install \
--vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
etc/%{name}.desktop
# Codec dir
install -dm 755 $RPM_BUILD_ROOT%{codecdir}
%post gui
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &>/dev/null || :
%postun gui
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &>/dev/null || :
%clean
rm -rf $RPM_BUILD_ROOT
%files
%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*
%lang(cs) %{_mandir}/cs/man1/mplayer.1*
%lang(de) %{_mandir}/de/man1/mplayer.1*
%lang(es) %{_mandir}/es/man1/mplayer.1*
%lang(fr) %{_mandir}/fr/man1/mplayer.1*
%lang(hu) %{_mandir}/hu/man1/mplayer.1*
%lang(it) %{_mandir}/it/man1/mplayer.1*
%lang(pl) %{_mandir}/pl/man1/mplayer.1*
%lang(ru) %{_mandir}/ru/man1/mplayer.1*
%lang(zh_CN) %{_mandir}/zh_CN/man1/mplayer.1*
%files gui
%defattr(-, root, root, -)
%{_bindir}/gmplayer
%{_datadir}/applications/*mplayer.desktop
%{_datadir}/icons/hicolor/32x32/apps/mplayer.xpm
%{_datadir}/mplayer/skins/
%files -n mencoder
%defattr(-, root, root, -)
%{_bindir}/mencoder
%{_mandir}/man1/mencoder.1*
%lang(cs) %{_mandir}/cs/man1/mencoder.1*
%lang(de) %{_mandir}/de/man1/mencoder.1*
%lang(es) %{_mandir}/es/man1/mencoder.1*
%lang(fr) %{_mandir}/fr/man1/mencoder.1*
%lang(hu) %{_mandir}/hu/man1/mencoder.1*
%lang(it) %{_mandir}/it/man1/mencoder.1*
%lang(pl) %{_mandir}/pl/man1/mencoder.1*
%lang(ru) %{_mandir}/ru/man1/mencoder.1*
%lang(zh_CN) %{_mandir}/zh_CN/man1/mencoder.1*
%files doc
%defattr(-, root, root, -)
%doc doc/en/ doc/tech/
%lang(cs) %doc doc/cs/
%lang(de) %doc doc/de/
%lang(es) %doc doc/es/
%lang(fr) %doc doc/fr/
%lang(hu) %doc doc/hu/
%lang(pl) %doc doc/pl/
%lang(ru) %doc doc/ru/
%lang(zh_CN) %doc doc/zh_CN/
%changelog
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0-0.95.20080613svn
- rebuild
* Sat Jun 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.94.20080613svn
- updated to latest SVN snapshot (bugs #1812, #1910, #1895)
- fixed building with svgalib support
- use pulseaudio output by default
- BR latest libdvdnav
- bring back live (bug #1950), make libnemesi optional
- drop obsolete patches
- fix building against fribidi (bug #1887)
- BR latest x264
- re-enable parallel make
* Sat Mar 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 1.0-0.93.20080211svn
- rebuild for new x264
* Mon Feb 11 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.92.20080211svn
- updated to latest SVN snapshot
- fixed opening files with spaces in their names (bug #1674)
- libnemesi doesn't conflict with live anymore
- fixed samba BR (bug #1809)
- enabled libnemesi by default
- made live optional
- security fixes: CVE-2008-0485, CVE-2008-0486, CVE-2008-0629, CVE-2008-0630
(bug #1852)
* Mon Dec 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.91.20071201svn
- use correct chanmap patch
- obsolete mplayer-fonts
- require our faad2 2.6.1
* Sat Dec 01 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.90.20071201svn
- updated to latest SVN snapshot
- reverted a change which requires newer libdvdnav snapshot
- fixed license tag
- use man-links instead of real filesystem symlinks for mencoder.1
- fixed desktop file
* Sun Nov 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.89.rc2
- rebuild against faad2-2.6.1
- drop obsolete patch
* Tue Nov 06 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.88.rc2
- fixed crash in vorbis decoder (bug #1516)
- added pulseaudio support
- better libnemesi support
- fixed libdca support
* Tue Nov 06 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.0-87
- rebuild
* Sat Oct 13 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.86.rc2
- work around Fedora bug 330031
* Thu Oct 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.85.rc2
- 1.0rc2
- drop obsolete/useless patches
- add experimental audio channel reordering patch
- optional libnemesi support (mutually exclusive with LIVE555)
- revert to internal faad2 (linking with 2.5 makes MPlayer non-distributable)
but leave a build-time option
- don't rebuild HTML docs for releases
- include Copyright file
* Thu Sep 27 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.84.20070923svn
- really fix it this time
* Wed Sep 26 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.83.20070923svn
- fix build on x86_32
* Wed Sep 26 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.82.20070923svn
- disable parallel make (fails on vidix)
- re-enable external faad2 (fixed in 2.5-4)
* Sun Sep 23 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.81.20070923svn
- latest snapshot
- update Blue skin
- fix seeking with -demux lavf
- dropped obsolete patches
- Czech manpage is already utf8 (bug #1626)
- fixes CVE-2007-4938 (bug #1645)
- disable external faad, seems broken
* Sat Jul 21 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.80.20070715svn
- fix build on i386
- another libdca patch update
- fix parallel builds
* Fri Jul 20 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.79.20070715svn
- fix a crash in subtitle selection code
- updated libdca patch
* Sun Jul 15 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.78.20070715svn
- latest snapshot
- use external libfaad again
- restore libdca support
- make ad_faad detect the correct sample rate on 64-bit systems
(based on a patch by Rasmus Rohde)
* Tue Jun 12 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.77.20070612svn
- latest snapshot
- dropped one obsolete patch
- fixed CVE-2007-2948 (#1525)
- backported compilation fix from r23546
- dropped redundant BR: libpng-devel (brought in by gtk2-devel)
* Tue May 15 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.75.20070513svn
- BuildRequire the new libdvdnav
* Sun May 13 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.74.20070513svn
- 20070513 snapshot
- libdha is now static
* Sun Mar 25 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.72.20070325svn
- 20070325 snapshot
- built with internal libav{codec,format,util}
- dropped obsolete patches
* Sun Mar 18 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.71.rc1
- fix buffer overflow in DS_VideoDecoder.c (bug #1443)
* Sat Mar 10 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.70.rc1
- fix buffer overflow in DMO_VideoDecoder.c
* Wed Jan 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.69.rc1
- fix buffer overflow in asmrp.c
* Thu Dec 28 2006 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.68.rc1
- don't depend on urw-fonts, use generic Sans font instead
* Tue Dec 26 2006 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.67.rc1
- disable bitmap fonts
- add libdca support
- add twolame support
- prevent linking mplayer with GUI libs
- make libmad support optional
* Sun Nov 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.66.rc1
- Apply upstream mp3lib workaround instead of disabling 3DNow altogether in it,
thanks to Dominik 'Rathann' Mierzejewski.
* Tue Oct 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.65.rc1
- 1.0rc1, ffmpeg WMV3 patch applied upstream.
- Include libdvdnav and x264 support.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.0-64
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.63.pre8
- Rebuild.
* Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.62.pre8
- Enable ffmpeg WMV3 decoder.
- Work around hang when dumping to wav on ix86 (#1127).
- Disable internal tremor due to above workaround making it crashy.
- Disable FriBidi (#612) and joystick (#983) in default config file.
- Specfile/build dependency cleanups.
- Update default Blue skin to 1.6.
* Thu Jul 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.61.pre8
- Move codecs dir to %%{_libdir}/codecs to follow upstream, old location
in %%{_libdir}/win32 still appears to work as a fallback.
- Ship codecs dir on all architectures again.
* Thu Jul 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.60.pre8
- Make DirectFB support optional, disabled by default (#1102).
- Adapt to lzo2, require it.
- Include midentify (#1105).
* Mon Jun 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.44.pre8
- System wide skins dir has changed to /usr/share/mplayer/skins (#1070).
* Thu Jun 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.42.pre8
- Make arts and esound support optional, disabled by default (#1067).
- Specfile and legacy dependency cleanups.
* Fri Jun 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.40.pre8
- 1.0pre8.
- Drop runtime CPU detection message removal patch.
- Disable XMMS and OpenAL support by default.
- Add support for building with JACK support, disabled by default.
- Don't include the %%{_libdir}/win32 dir on non-x86.
- Fix %%lang tags in -doc.
* Sat May 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.20060513
- 2006-05-13 CVS snapshot.
- Make audio output default to ALSA in default config (#970).
- Trim pre-2005 %%changelog entries.
* Sat May 06 2006 Noa Resare <noa(a)resare.com>
- Move doc to a separate package (#960).
* Sun Apr 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.20060412
- Enable Musepack support.
* Thu Apr 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.38.20060412
- 2006-04-12 CVS snapshot.
- Fix 3dnow disabling patch, some parts were erroneously omitted in the
previous revision (Thomas Jansen).
* Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.38.20060407
- 2006-04-07 CVS snapshot using shared ffmpeg, GTK2, FAAC, OpenAL, and XvMC.
- XMMS input plugin support can be disabled by rebuilding with "--without xmms"
- GUI changes: use upstream desktop entry file, update GTK icon cache and
desktop database at post(un)install time, install icon to %%{_datadir}/icons.
- Drop lots of obsolete patches.
* Fri Mar 24 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.0-0.37.pre7try2
- fix #836
- fix #835,#834 by disabling detection of 3dnowext for now (Thomas Jansen)
this should work around the garbage sound output
* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.36.pre7try2
- Add RLO identifier to version string per upstream recommendation.
- Use configure flags instead of patch for enabling v4l*.
- Make DVB and DirectFB support unconditional.
- Drop libXvMC-devel build dependency until xvmc is actually built (#731).
- Backport get_time_pos slave mode command from CVS to fix progress bar
with mplayerplug-in >= 3.15.
- Drop vdr-mplayer slave mode patch.
- Rename mplayer-mencoder to mencoder.
* Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.0-0.35.pre7try2
- fix x86_64 asm issues (maybe?!)
- fix file section for ppc
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Feb 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.34.pre7try2
- Apply upstream demuxer.h heap overflow fix (CVE-2006-0579).
- Fix build time X11 detection on lib64 archs.
- Update Blue skin to 1.5.
* Mon Jan 16 2006 Adrian Reber <adrian(a)lisas.de> - 1.0-0.lvn.0.32.pre7try2
- re-enabled the aalib-devel BR
* Thu Dec 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.31.pre7try2
- Apply fix for CVE-2005-4048 from ffmpeg CVS.
* Sun Dec 11 2005 Adrian Reber <adrian(a)lisas.de> - 1.0-0.lvn.0.30.pre7try2
- changed BR for modular X
- temporary removal of aalib-devel BR
* Fri Nov 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.29.pre7try2
- More pre-FC3 cleanups.
- Make "Blue" the default skin by symlinking, fixes fallback (#571).
- Build against new DirectFB.
* Thu Sep 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.28.pre7try2
- Clean up obsolete pre-FC3 stuff (LIRC, CACA, DXR3, and Enca support now
unconditional).
- Drop zero Epochs.
* Thu Sep 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.27.pre7try2
- Enable Enca by default, build with it for FC3+.
* Tue Sep 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.26.pre7try2
- 1.0pre7try2.
- Enable v4l2 interface (#576).
- Enable DVB support only with recent enough glibc-kernheaders.
* Mon Jul 4 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:1.0-0.lvn.0.26.pre7
- Add a patch to allow compiling for x86_64-FC4; thx to Ryo Dairiki:
https://www.redhat.com/archives/fedora-extras-list/2005-July/msg00997.html
* Mon Jul 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.25.pre7
- Enable DirectFB by default, rebuild with "--without directfb" to disable.
- Clean up obsolete pre-FC2 support.
* Thu Jun 30 2005 Dams <anvil[AT]livna.org> - 0:1.0-0.lvn.0.24.pre7
- Added patch to fix ppc/altivec builds (#494)
* Mon Jun 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.23.pre7
- Completely disable parallel make for now.
* Mon Jun 6 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:1.0-0.lvn.0.22.pre7
- add gcc4 patch from thias/gentoo/myself
* Mon May 9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.21.pre7
- Use em8300-devel for DXR3 support, and make it optional, default enabled.
* Tue May 03 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0-0.lvn.0.20.pre7
- fix build issues on x86_64:
- move target= to a ix86 section -- on x86_64 it passes the option x86-64
and not x86_64
- use explicit --with-xmmslibdir
- {_libdir}/libdha.so.* and {_libdir}/mplayer are missing on x86_64
* Tue Apr 19 2005 Dams <anvil[AT]livna.org> - 0:1.0-0.lvn.0.19.pre7
- Updated installstrip patch
- Updated ldconfig patch
- Updated to 1.0pre7
* Sun Feb 27 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0-0.lvn.0.18.pre6a
- Fix PPC build (David Woodhouse, bug 376).
- Add libcaca support (rebuild "--without caca" to disable).
- Rebuild with LIRC support.
* Thu Jan 6 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0-0.lvn.0.17.pre6a
- Update to 1.0pre6a (== 1.0pre6 + included HTML docs).
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:53:56 -0000 1.1
+++ .cvsignore 9 Aug 2008 09:32:32 -0000 1.2
@@ -0,0 +1,2 @@
+Blue-1.7.tar.bz2
+mplayer-export-2008-06-13.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:53:56 -0000 1.1
+++ sources 9 Aug 2008 09:32:32 -0000 1.2
@@ -0,0 +1,2 @@
+e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
+86fe793e1f0dccc48b97cf39c8e232c3 mplayer-export-2008-06-13.tar.bz2
16 years, 2 months
rpms/ffmpeg-compat/F-8 ffmpeg-asmreg.patch, NONE, 1.1 ffmpeg-compat.spec, NONE, 1.1 ffmpeg-pkgconfig.patch, NONE, 1.1 ffmpeg-snapshot.sh, NONE, 1.1 ffmpeg-suffix-20080113.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/ffmpeg-compat/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26978
Modified Files:
.cvsignore sources
Added Files:
ffmpeg-asmreg.patch ffmpeg-compat.spec ffmpeg-pkgconfig.patch
ffmpeg-snapshot.sh ffmpeg-suffix-20080113.patch
Log Message:
initial import from livna
ffmpeg-asmreg.patch:
--- NEW FILE ffmpeg-asmreg.patch ---
diff -up ffmpeg-20070923/libavcodec/Makefile.asmreg ffmpeg-20070923/libavcodec/Makefile
--- ffmpeg-20070923/libavcodec/Makefile.asmreg 2007-09-23 18:20:34.000000000 +0200
+++ ffmpeg-20070923/libavcodec/Makefile 2007-09-23 20:36:28.000000000 +0200
@@ -87,6 +87,11 @@ OBJS-$(CONFIG_H263I_DECODER) +
OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o
OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o
OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o cabac.o golomb.o
+# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm'
+# on ix86 in cabac.h
+ifeq ($(ARCH_X86_32),yes)
+h264.o: CFLAGS += -fomit-frame-pointer
+endif
OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
--- NEW FILE ffmpeg-compat.spec ---
# TODO: add make test to %%check section
%define svn 20080225
%define faad2min 1:2.6.1
%define _with_swscaler 0
%define _with_compat 1
%if 0%{?_with_compat:1}
%define buildsuf -compat
%endif
Summary: Libraries for ffmpeg-compat
Name: ffmpeg-compat
Version: 0.4.9
Release: 0.48.%{svn}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://ffmpeg.org/
Source0: http://rpm.greysector.net/livna/ffmpeg-%{svn}.tar.bz2
Source1: ffmpeg-snapshot.sh
Patch2: ffmpeg-pkgconfig.patch
Patch4: ffmpeg-asmreg.patch
Patch5: ffmpeg-suffix-20080113.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: a52dec-devel
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
BuildRequires: zlib-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
BuildRequires: libvorbis-devel
BuildRequires: libtheora-devel
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: xvidcore-devel
BuildRequires: SDL-devel
BuildRequires: gsm-devel
BuildRequires: imlib2-devel
BuildRequires: texi2html
BuildRequires: faac-devel
BuildRequires: x264-devel
%description
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.
This package contains the libraries for %{name}
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
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.
This package contains development files for %{name}
!!! Developer Warning !!!
This package contains a version of ffmpeg built without libswscale.
Softwares that use ffmpeg-compat libaries need to be ported to the new
swscaler API. (see libswscale/swscale-example.c from the doc section).
ffmpeg-compat is deprecated and will be removed at some point.
%prep
%setup -q -n ffmpeg-%{svn}
%patch2 -p1 -b .pkgconfig
%patch4 -p1 -b .asmreg
%if 0%{?_with_compat:1}
%patch5 -p1 -b .suffix
%endif
%build
./configure \
--prefix=%{_prefix} \
%if 0%{?_with_compat:1}
--disable-ffmpeg \
--disable-ffserver \
--disable-ffplay \
--disable-vhook \
--build-suffix=%{?buildsuf} \
--incdir=%{_includedir}/ffmpeg%{?buildsuf} \
--disable-swscaler \
%else
--incdir=%{_includedir}/ffmpeg \
%endif
--libdir=%{_libdir} \
--shlibdir=%{_libdir} \
--mandir=%{_mandir} \
--arch=%{_target_cpu} \
--extra-cflags="$RPM_OPT_FLAGS" \
%{?_with_amr: --enable-libamr-nb --enable-libamr-wb --enable-nonfree} \
--enable-libdc1394 \
--enable-liba52 \
--enable-libfaac \
--enable-libfaad \
--enable-libgsm \
--enable-libmp3lame \
--enable-libtheora \
--enable-libvorbis \
--enable-libxvid \
--enable-libx264 \
--enable-pp \
--enable-pthreads \
--disable-static \
--enable-shared \
--enable-gpl \
--disable-debug \
--disable-optimizations \
--disable-strip
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT __doc
make install DESTDIR=$RPM_BUILD_ROOT
# We don't provide the doc for the compat-version
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING.GPL CREDITS Changelog README
%{_libdir}/libavcodec%{?buildsuf}.so.*
%{_libdir}/libavdevice%{?buildsuf}.so.*
%{_libdir}/libavformat%{?buildsuf}.so.*
%{_libdir}/libavutil%{?buildsuf}.so.*
%{_libdir}/libpostproc%{?buildsuf}.so.*
%files devel
%defattr(-,root,root,-)
# Note: as of 20070204, --incdir doesn't affect postproc.
%doc libswscale/swscale-example.c
%{_includedir}/ffmpeg%{?buildsuf}
%{_prefix}/include/postproc%{?buildsuf}
%{_libdir}/libavcodec%{?buildsuf}.so
%{_libdir}/libavdevice%{?buildsuf}.so
%{_libdir}/libavformat%{?buildsuf}.so
%{_libdir}/libavutil%{?buildsuf}.so
%{_libdir}/libpostproc%{?buildsuf}.so
%{_libdir}/pkgconfig/libswscale%{?buildsuf}.pc
%{_libdir}/pkgconfig/libavcodec%{?buildsuf}.pc
%{_libdir}/pkgconfig/libavdevice%{?buildsuf}.pc
%{_libdir}/pkgconfig/libavformat%{?buildsuf}.pc
%{_libdir}/pkgconfig/libavutil%{?buildsuf}.pc
%{_libdir}/pkgconfig/libpostproc%{?buildsuf}.pc
%changelog
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.9-0.48.20080225
- rebuild
* Fri Jun 20 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.47.20080225
- Sync with ffmpeg
- last snapshot before API change (20080225)
* Sun Mar 02 2008 Thorsten Leemhuis <fedora at leemhuis dot info> - 0.4.9-0.46.20080113
- Rebuild
* Sat Feb 23 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.45.20080113
- Remove libnut conditional (deprecated).
- Remove dirac conditional (they need to submit patch upstream).
- Improve description for ffmpeg-compat.
* Sat Feb 23 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.44.20080113
- Move to ffmpeg-compat
- Disable swscaler
- Disable vhook
- Disable ffmpeg binaries.
- Built with -compat SONAME suffix
* Sun Jan 13 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.44.20080113
- 20080113 snapshot
- drop unnecessary patch
- enable libdc1394 support
- enable swscaler
* Mon Nov 12 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.43.20071111
- ensure that we use the correct faad2 version
* Sun Nov 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.42.20071111
- 20071111 snapshot
- current faad2 is good again
* Thu Oct 18 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.41.20071011
- fix BRs and Requires for faad2
* Thu Oct 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.40.20071011
- 20071011 snapshot
- don't link against faad2-2.5, it makes GPL'd binary non-distributable
- go back to normal linking instead of dlopen() of liba52
* Sun Sep 23 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.39.20070923
- 20070923 snapshot
- use faad2 2.5
- optional AMR support
- dropped obsolete patch
* Thu Jun 07 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.38.20070607
- 20070607 snapshot
- libdca BR dropped (no longer supported)
- drop gsm.h path hack, gsm in Fedora now provides a compatibility symlink
- remove arch hacks, ffmpeg's configure is smart enough
- enable cmov on x86_64
* Thu May 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.37.20070503
- require older faad2 to prevent bugreports like #1388
- prepare for libdc1394 support
- enable pthreads
- 20070503 snapshot
* Thu Feb 08 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.35.20070204
- libswscale.pc is necessary regardless of --enable-swscaler
* Sun Feb 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.34.20070204
- 2007-02-04 snapshot, enable libtheora.
- Make swscaler optional, disabled again by default (#1379).
* Fri Jan 05 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.34.20061214
- move vhooks to -libs
* Wed Jan 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.33.20061214
- split -libs subpackage for multilib installs
* Tue Dec 26 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.32.20061214
- new kino works with swscaler, re-enabled
* Tue Dec 19 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.31.20061214
- disable swscaler, it breaks kino
ffmpeg-pkgconfig.patch:
--- NEW FILE ffmpeg-pkgconfig.patch ---
diff -up ffmpeg-20080113/configure.pkgconfig ffmpeg-20080113/configure
--- ffmpeg-20080113/configure.pkgconfig 2008-01-12 13:34:55.000000000 +0100
+++ ffmpeg-20080113/configure 2008-01-13 21:03:30.000000000 +0100
@@ -2122,7 +2122,7 @@ include=$6
cat <<EOF >$name.pc
prefix=$PREFIX
exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=$libdir
includedir=\${prefix}/include
Name: $name
@@ -2161,13 +2161,13 @@ EOF
pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
+pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec" "libavutil = $lavu_version" ffmpeg
pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat" "libavcodec = $lavc_version" ffmpeg
pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "libavformat = $lavf_version" ffmpeg
pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
if enabled pp; then
pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
@@ -2178,7 +2178,7 @@ if enabled swscaler; then
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
else
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" ffmpeg
pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
apply libswscale.pc sed s/^Libs:.*$/Libs:/
apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
--- NEW FILE ffmpeg-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y%m%d)
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
cd ffmpeg-$svn
./version.sh .
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
cd - >/dev/null
ffmpeg-suffix-20080113.patch:
--- NEW FILE ffmpeg-suffix-20080113.patch ---
diff -up ffmpeg-20080113/Makefile.ffmpeg-suffix ffmpeg-20080113/Makefile
--- ffmpeg-20080113/Makefile.ffmpeg-suffix 2008-01-13 20:46:17.000000000 +0100
+++ ffmpeg-20080113/Makefile 2008-02-11 16:44:04.000000000 +0100
@@ -50,7 +50,7 @@ HOOKS-$(HAVE_FORK) += ppm
HOOKS-$(HAVE_IMLIB2) += imlib2
HOOKS-$(HAVE_FREETYPE2) += drawtext
-HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
+HOOKS = $(addprefix vhook$(BUILDSUF)/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
@@ -122,7 +122,7 @@ ffmpeg.o ffplay.o ffserver.o: version.h
videohook: .libs $(HOOKS)
-vhook/%$(SLIBSUF): vhook/%.o
+vhook$(BUILDSUF)/%$(SLIBSUF): vhook/%.o
$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
vhook/%.o: vhook/%.c
@@ -163,8 +163,8 @@ install-man:
install -m 644 $(MANPAGES) "$(MANDIR)/man1"
install-vhook: videohook
- install -d "$(SHLIBDIR)/vhook"
- install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
+ install -d "$(SHLIBDIR)/vhook$(BUILDSUF)"
+ install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook$(BUILDSUF)"
install-libs:
$(MAKE) -C libavutil install-libs
@@ -202,7 +202,7 @@ uninstall-man:
uninstall-vhook:
rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
- -rmdir "$(SHLIBDIR)/vhook/"
+ -rmdir "$(SHLIBDIR)/vhook$(BUILDSUF)/"
uninstall-libs:
$(MAKE) -C libavutil uninstall-libs
diff -up ffmpeg-20080113/configure.ffmpeg-suffix ffmpeg-20080113/configure
--- ffmpeg-20080113/configure.ffmpeg-suffix 2008-02-11 16:44:04.000000000 +0100
+++ ffmpeg-20080113/configure 2008-02-11 16:44:04.000000000 +0100
@@ -2158,27 +2158,27 @@ Cflags: -I\${includedir}
EOF
}
-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
+pkgconfig_generate libavutil${BUILDSUF} "FFmpeg utility library" "$lavu_version" -lavutil${BUILDSUF} "" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec" "libavutil = $lavu_version" ffmpeg
+pkgconfig_generate libavcodec${BUILDSUF} "FFmpeg codec library" "$lavc_version" "-lavcodec${BUILDSUF}" "libavutil${BUILDSUF} = $lavu_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat" "libavcodec = $lavc_version" ffmpeg
+pkgconfig_generate libavformat${BUILDSUF} "FFmpeg container format library" "$lavf_version" "-lavformat${BUILDSUF}" "libavcodec${BUILDSUF} = $lavc_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "libavformat = $lavf_version" ffmpeg
+pkgconfig_generate libavdevice${BUILDSUF} "FFmpeg device handling library" "$lavd_version" "-lavdevice${BUILDSUF} $extralibs" "libavformat${BUILDSUF} = $lavf_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
if enabled pp; then
- pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
+ pkgconfig_generate libpostproc${BUILDSUF} "FFmpeg post processing library" "$pp_version" -lpostproc${BUILDSUF} "" postproc${BUILDSUF}
pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
fi
if enabled swscaler; then
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
+ pkgconfig_generate libswscale${BUILDSUF} "FFmpeg image rescaling library" "$sws_version" -lswscale${BUILDSUF} "libavutil${BUILDSUF} = $lavu_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
else
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" ffmpeg
+ pkgconfig_generate libswscale${BUILDSUF} "FFmpeg image rescaling library" "$sws_version" "" "libavcodec${BUILDSUF} = $lavc_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
apply libswscale.pc sed s/^Libs:.*$/Libs:/
apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
diff -up ffmpeg-20080113/common.mak.ffmpeg-suffix ffmpeg-20080113/common.mak
--- ffmpeg-20080113/common.mak.ffmpeg-suffix 2007-12-06 00:15:24.000000000 +0100
+++ ffmpeg-20080113/common.mak 2008-02-11 16:44:04.000000000 +0100
@@ -83,7 +83,7 @@ install-headers:
install -d "$(INCDIR)"
install -d "$(LIBDIR)/pkgconfig"
install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)"
- install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
+ install -m 644 $(BUILD_ROOT)/lib$(NAME)$(BUILDSUF).pc "$(LIBDIR)/pkgconfig"
uninstall: uninstall-libs uninstall-headers
diff -up ffmpeg-20080113/libpostproc/Makefile.ffmpeg-suffix ffmpeg-20080113/libpostproc/Makefile
--- ffmpeg-20080113/libpostproc/Makefile.ffmpeg-suffix 2007-10-30 08:54:18.000000000 +0100
+++ ffmpeg-20080113/libpostproc/Makefile 2008-02-11 16:44:04.000000000 +0100
@@ -2,7 +2,7 @@
include ../config.mak
# Overload incdir, postproc include files go in a different directory.
-INCDIR=$(prefix)/include/postproc
+INCDIR=$(prefix)/include/postproc$(BUILDSUF)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
@@ -23,4 +23,4 @@ postprocess_pic.o: postprocess.c
$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
uninstall-headers::
- -rmdir "$(prefix)/include/postproc"
+ -rmdir "$(prefix)/include/postproc$(BUILDSUF)"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg-compat/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Aug 2008 08:48:58 -0000 1.1
+++ .cvsignore 9 Aug 2008 08:57:20 -0000 1.2
@@ -0,0 +1 @@
+ffmpeg-20080225.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg-compat/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Aug 2008 08:48:58 -0000 1.1
+++ sources 9 Aug 2008 08:57:20 -0000 1.2
@@ -0,0 +1 @@
+3eb49e193a0aa95908291fd7dac65114 ffmpeg-20080225.tar.bz2
16 years, 2 months
rpms/ffmpeg-compat/F-9 ffmpeg-asmreg.patch, NONE, 1.1 ffmpeg-compat.spec, NONE, 1.1 ffmpeg-pkgconfig.patch, NONE, 1.1 ffmpeg-snapshot.sh, NONE, 1.1 ffmpeg-suffix-20080113.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/ffmpeg-compat/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26846
Modified Files:
.cvsignore sources
Added Files:
ffmpeg-asmreg.patch ffmpeg-compat.spec ffmpeg-pkgconfig.patch
ffmpeg-snapshot.sh ffmpeg-suffix-20080113.patch
Log Message:
initial import from livna
ffmpeg-asmreg.patch:
--- NEW FILE ffmpeg-asmreg.patch ---
diff -up ffmpeg-20070923/libavcodec/Makefile.asmreg ffmpeg-20070923/libavcodec/Makefile
--- ffmpeg-20070923/libavcodec/Makefile.asmreg 2007-09-23 18:20:34.000000000 +0200
+++ ffmpeg-20070923/libavcodec/Makefile 2007-09-23 20:36:28.000000000 +0200
@@ -87,6 +87,11 @@ OBJS-$(CONFIG_H263I_DECODER) +
OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o
OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o
OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o cabac.o golomb.o
+# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm'
+# on ix86 in cabac.h
+ifeq ($(ARCH_X86_32),yes)
+h264.o: CFLAGS += -fomit-frame-pointer
+endif
OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o
--- NEW FILE ffmpeg-compat.spec ---
# TODO: add make test to %%check section
%define svn 20080225
%define faad2min 1:2.6.1
%define _with_swscaler 0
%define _with_compat 1
%if 0%{?_with_compat:1}
%define buildsuf -compat
%endif
Summary: Libraries for ffmpeg-compat
Name: ffmpeg-compat
Version: 0.4.9
Release: 0.48.%{svn}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://ffmpeg.org/
Source0: http://rpm.greysector.net/livna/ffmpeg-%{svn}.tar.bz2
Source1: ffmpeg-snapshot.sh
Patch2: ffmpeg-pkgconfig.patch
Patch4: ffmpeg-asmreg.patch
Patch5: ffmpeg-suffix-20080113.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: a52dec-devel
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
BuildRequires: zlib-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
BuildRequires: libvorbis-devel
BuildRequires: libtheora-devel
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: xvidcore-devel
BuildRequires: SDL-devel
BuildRequires: gsm-devel
BuildRequires: imlib2-devel
BuildRequires: texi2html
BuildRequires: faac-devel
BuildRequires: x264-devel
%description
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.
This package contains the libraries for %{name}
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
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.
This package contains development files for %{name}
!!! Developer Warning !!!
This package contains a version of ffmpeg built without libswscale.
Softwares that use ffmpeg-compat libaries need to be ported to the new
swscaler API. (see libswscale/swscale-example.c from the doc section).
ffmpeg-compat is deprecated and will be removed at some point.
%prep
%setup -q -n ffmpeg-%{svn}
%patch2 -p1 -b .pkgconfig
%patch4 -p1 -b .asmreg
%if 0%{?_with_compat:1}
%patch5 -p1 -b .suffix
%endif
%build
./configure \
--prefix=%{_prefix} \
%if 0%{?_with_compat:1}
--disable-ffmpeg \
--disable-ffserver \
--disable-ffplay \
--disable-vhook \
--build-suffix=%{?buildsuf} \
--incdir=%{_includedir}/ffmpeg%{?buildsuf} \
--disable-swscaler \
%else
--incdir=%{_includedir}/ffmpeg \
%endif
--libdir=%{_libdir} \
--shlibdir=%{_libdir} \
--mandir=%{_mandir} \
--arch=%{_target_cpu} \
--extra-cflags="$RPM_OPT_FLAGS" \
%{?_with_amr: --enable-libamr-nb --enable-libamr-wb --enable-nonfree} \
--enable-libdc1394 \
--enable-liba52 \
--enable-libfaac \
--enable-libfaad \
--enable-libgsm \
--enable-libmp3lame \
--enable-libtheora \
--enable-libvorbis \
--enable-libxvid \
--enable-libx264 \
--enable-pp \
--enable-pthreads \
--disable-static \
--enable-shared \
--enable-gpl \
--disable-debug \
--disable-optimizations \
--disable-strip
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT __doc
make install DESTDIR=$RPM_BUILD_ROOT
# We don't provide the doc for the compat-version
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING.GPL CREDITS Changelog README
%{_libdir}/libavcodec%{?buildsuf}.so.*
%{_libdir}/libavdevice%{?buildsuf}.so.*
%{_libdir}/libavformat%{?buildsuf}.so.*
%{_libdir}/libavutil%{?buildsuf}.so.*
%{_libdir}/libpostproc%{?buildsuf}.so.*
%files devel
%defattr(-,root,root,-)
# Note: as of 20070204, --incdir doesn't affect postproc.
%doc libswscale/swscale-example.c
%{_includedir}/ffmpeg%{?buildsuf}
%{_prefix}/include/postproc%{?buildsuf}
%{_libdir}/libavcodec%{?buildsuf}.so
%{_libdir}/libavdevice%{?buildsuf}.so
%{_libdir}/libavformat%{?buildsuf}.so
%{_libdir}/libavutil%{?buildsuf}.so
%{_libdir}/libpostproc%{?buildsuf}.so
%{_libdir}/pkgconfig/libswscale%{?buildsuf}.pc
%{_libdir}/pkgconfig/libavcodec%{?buildsuf}.pc
%{_libdir}/pkgconfig/libavdevice%{?buildsuf}.pc
%{_libdir}/pkgconfig/libavformat%{?buildsuf}.pc
%{_libdir}/pkgconfig/libavutil%{?buildsuf}.pc
%{_libdir}/pkgconfig/libpostproc%{?buildsuf}.pc
%changelog
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.9-0.48.20080225
- rebuild
* Fri Jun 20 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.47.20080225
- Sync with ffmpeg
- last snapshot before API change (20080225)
* Sun Mar 02 2008 Thorsten Leemhuis <fedora at leemhuis dot info> - 0.4.9-0.46.20080113
- Rebuild
* Sat Feb 23 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.45.20080113
- Remove libnut conditional (deprecated).
- Remove dirac conditional (they need to submit patch upstream).
- Improve description for ffmpeg-compat.
* Sat Feb 23 2008 kwizart < kwizart at gmail.com > - 0.4.9-0.44.20080113
- Move to ffmpeg-compat
- Disable swscaler
- Disable vhook
- Disable ffmpeg binaries.
- Built with -compat SONAME suffix
* Sun Jan 13 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.44.20080113
- 20080113 snapshot
- drop unnecessary patch
- enable libdc1394 support
- enable swscaler
* Mon Nov 12 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.43.20071111
- ensure that we use the correct faad2 version
* Sun Nov 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.42.20071111
- 20071111 snapshot
- current faad2 is good again
* Thu Oct 18 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.41.20071011
- fix BRs and Requires for faad2
* Thu Oct 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.40.20071011
- 20071011 snapshot
- don't link against faad2-2.5, it makes GPL'd binary non-distributable
- go back to normal linking instead of dlopen() of liba52
* Sun Sep 23 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.39.20070923
- 20070923 snapshot
- use faad2 2.5
- optional AMR support
- dropped obsolete patch
* Thu Jun 07 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.38.20070607
- 20070607 snapshot
- libdca BR dropped (no longer supported)
- drop gsm.h path hack, gsm in Fedora now provides a compatibility symlink
- remove arch hacks, ffmpeg's configure is smart enough
- enable cmov on x86_64
* Thu May 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.37.20070503
- require older faad2 to prevent bugreports like #1388
- prepare for libdc1394 support
- enable pthreads
- 20070503 snapshot
* Thu Feb 08 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.35.20070204
- libswscale.pc is necessary regardless of --enable-swscaler
* Sun Feb 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.34.20070204
- 2007-02-04 snapshot, enable libtheora.
- Make swscaler optional, disabled again by default (#1379).
* Fri Jan 05 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.34.20061214
- move vhooks to -libs
* Wed Jan 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.33.20061214
- split -libs subpackage for multilib installs
* Tue Dec 26 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.32.20061214
- new kino works with swscaler, re-enabled
* Tue Dec 19 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.31.20061214
- disable swscaler, it breaks kino
ffmpeg-pkgconfig.patch:
--- NEW FILE ffmpeg-pkgconfig.patch ---
diff -up ffmpeg-20080113/configure.pkgconfig ffmpeg-20080113/configure
--- ffmpeg-20080113/configure.pkgconfig 2008-01-12 13:34:55.000000000 +0100
+++ ffmpeg-20080113/configure 2008-01-13 21:03:30.000000000 +0100
@@ -2122,7 +2122,7 @@ include=$6
cat <<EOF >$name.pc
prefix=$PREFIX
exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=$libdir
includedir=\${prefix}/include
Name: $name
@@ -2161,13 +2161,13 @@ EOF
pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
+pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec" "libavutil = $lavu_version" ffmpeg
pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat" "libavcodec = $lavc_version" ffmpeg
pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "libavformat = $lavf_version" ffmpeg
pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
if enabled pp; then
pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
@@ -2178,7 +2178,7 @@ if enabled swscaler; then
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
else
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" ffmpeg
pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
apply libswscale.pc sed s/^Libs:.*$/Libs:/
apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
--- NEW FILE ffmpeg-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y%m%d)
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
cd ffmpeg-$svn
./version.sh .
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
cd - >/dev/null
ffmpeg-suffix-20080113.patch:
--- NEW FILE ffmpeg-suffix-20080113.patch ---
diff -up ffmpeg-20080113/Makefile.ffmpeg-suffix ffmpeg-20080113/Makefile
--- ffmpeg-20080113/Makefile.ffmpeg-suffix 2008-01-13 20:46:17.000000000 +0100
+++ ffmpeg-20080113/Makefile 2008-02-11 16:44:04.000000000 +0100
@@ -50,7 +50,7 @@ HOOKS-$(HAVE_FORK) += ppm
HOOKS-$(HAVE_IMLIB2) += imlib2
HOOKS-$(HAVE_FREETYPE2) += drawtext
-HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
+HOOKS = $(addprefix vhook$(BUILDSUF)/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
@@ -122,7 +122,7 @@ ffmpeg.o ffplay.o ffserver.o: version.h
videohook: .libs $(HOOKS)
-vhook/%$(SLIBSUF): vhook/%.o
+vhook$(BUILDSUF)/%$(SLIBSUF): vhook/%.o
$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
vhook/%.o: vhook/%.c
@@ -163,8 +163,8 @@ install-man:
install -m 644 $(MANPAGES) "$(MANDIR)/man1"
install-vhook: videohook
- install -d "$(SHLIBDIR)/vhook"
- install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
+ install -d "$(SHLIBDIR)/vhook$(BUILDSUF)"
+ install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook$(BUILDSUF)"
install-libs:
$(MAKE) -C libavutil install-libs
@@ -202,7 +202,7 @@ uninstall-man:
uninstall-vhook:
rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
- -rmdir "$(SHLIBDIR)/vhook/"
+ -rmdir "$(SHLIBDIR)/vhook$(BUILDSUF)/"
uninstall-libs:
$(MAKE) -C libavutil uninstall-libs
diff -up ffmpeg-20080113/configure.ffmpeg-suffix ffmpeg-20080113/configure
--- ffmpeg-20080113/configure.ffmpeg-suffix 2008-02-11 16:44:04.000000000 +0100
+++ ffmpeg-20080113/configure 2008-02-11 16:44:04.000000000 +0100
@@ -2158,27 +2158,27 @@ Cflags: -I\${includedir}
EOF
}
-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
+pkgconfig_generate libavutil${BUILDSUF} "FFmpeg utility library" "$lavu_version" -lavutil${BUILDSUF} "" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec" "libavutil = $lavu_version" ffmpeg
+pkgconfig_generate libavcodec${BUILDSUF} "FFmpeg codec library" "$lavc_version" "-lavcodec${BUILDSUF}" "libavutil${BUILDSUF} = $lavu_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat" "libavcodec = $lavc_version" ffmpeg
+pkgconfig_generate libavformat${BUILDSUF} "FFmpeg container format library" "$lavf_version" "-lavformat${BUILDSUF}" "libavcodec${BUILDSUF} = $lavc_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "libavformat = $lavf_version" ffmpeg
+pkgconfig_generate libavdevice${BUILDSUF} "FFmpeg device handling library" "$lavd_version" "-lavdevice${BUILDSUF} $extralibs" "libavformat${BUILDSUF} = $lavf_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
if enabled pp; then
- pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
+ pkgconfig_generate libpostproc${BUILDSUF} "FFmpeg post processing library" "$pp_version" -lpostproc${BUILDSUF} "" postproc${BUILDSUF}
pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
fi
if enabled swscaler; then
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
+ pkgconfig_generate libswscale${BUILDSUF} "FFmpeg image rescaling library" "$sws_version" -lswscale${BUILDSUF} "libavutil${BUILDSUF} = $lavu_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
else
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" ffmpeg
+ pkgconfig_generate libswscale${BUILDSUF} "FFmpeg image rescaling library" "$sws_version" "" "libavcodec${BUILDSUF} = $lavc_version" ffmpeg${BUILDSUF}
pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
apply libswscale.pc sed s/^Libs:.*$/Libs:/
apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
diff -up ffmpeg-20080113/common.mak.ffmpeg-suffix ffmpeg-20080113/common.mak
--- ffmpeg-20080113/common.mak.ffmpeg-suffix 2007-12-06 00:15:24.000000000 +0100
+++ ffmpeg-20080113/common.mak 2008-02-11 16:44:04.000000000 +0100
@@ -83,7 +83,7 @@ install-headers:
install -d "$(INCDIR)"
install -d "$(LIBDIR)/pkgconfig"
install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(INCDIR)"
- install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
+ install -m 644 $(BUILD_ROOT)/lib$(NAME)$(BUILDSUF).pc "$(LIBDIR)/pkgconfig"
uninstall: uninstall-libs uninstall-headers
diff -up ffmpeg-20080113/libpostproc/Makefile.ffmpeg-suffix ffmpeg-20080113/libpostproc/Makefile
--- ffmpeg-20080113/libpostproc/Makefile.ffmpeg-suffix 2007-10-30 08:54:18.000000000 +0100
+++ ffmpeg-20080113/libpostproc/Makefile 2008-02-11 16:44:04.000000000 +0100
@@ -2,7 +2,7 @@
include ../config.mak
# Overload incdir, postproc include files go in a different directory.
-INCDIR=$(prefix)/include/postproc
+INCDIR=$(prefix)/include/postproc$(BUILDSUF)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
@@ -23,4 +23,4 @@ postprocess_pic.o: postprocess.c
$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -o $@ $<
uninstall-headers::
- -rmdir "$(prefix)/include/postproc"
+ -rmdir "$(prefix)/include/postproc$(BUILDSUF)"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg-compat/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Aug 2008 08:48:58 -0000 1.1
+++ .cvsignore 9 Aug 2008 08:56:42 -0000 1.2
@@ -0,0 +1 @@
+ffmpeg-20080225.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg-compat/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Aug 2008 08:48:58 -0000 1.1
+++ sources 9 Aug 2008 08:56:42 -0000 1.2
@@ -0,0 +1 @@
+3eb49e193a0aa95908291fd7dac65114 ffmpeg-20080225.tar.bz2
16 years, 2 months
rpms/y4mscaler/devel y4mscaler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/y4mscaler/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26450
Modified Files:
.cvsignore sources
Added Files:
y4mscaler.spec
Log Message:
initial import from livna
--- NEW FILE y4mscaler.spec ---
Name: y4mscaler
Version: 9.0
Release: 6%{?dist}
Summary: Video scaler which operates on YUV4MPEG2 streams
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mir.com/DMG/Software/
Source0: http://www.mir.com/DMG/Software/%{name}-%{version}-src.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mjpegtools-devel >= 1.6.3
%description
y4mscaler is a video scaler which operates on YUV4MPEG2 streams, as
used by the tools in the MJPEGtools project. It essentially takes
some region of an input stream, and scales it into some region of the
output stream.
%prep
%setup -q
%build
make %{?_smp_mflags} CXX="%{__cxx}" COPT="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 y4mscaler $RPM_BUILD_ROOT%{_bindir}/y4mscaler
install -Dpm 644 y4mscaler.1 $RPM_BUILD_ROOT%{_mandir}/man1/y4mscaler.1
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README TODO
%{_bindir}/y4mscaler
%{_mandir}/man1/y4mscaler.1*
%changelog
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 9.0-6
- rebuild
* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 9.0-5
- License: GPLv2+
* Fri Jun 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 9.0-4
- Rebuild.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 9.0-3
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Mon Sep 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 9.0-2
- Rebuild.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Mon Dec 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 9.0-0.lvn.1
- 9.0.
* Sun Oct 9 2005 Dams <anvil[AT]livna.org> - 8.1-0.lvn.5
- Really rebuild against mjpegtools
* Mon Sep 26 2005 Thorsten Leemhuis <fedoral[AT]leemhuis.info> - 8.1-0.lvn.4
- Rebuilt against new mjpegtools
* Tue Aug 30 2005 Dams <anvil[AT]livna.org> - 8.1-0.lvn.3
- Rebuilt against new mjpegtools
* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 8.1-0.lvn.2
- Lower mjpegtools-devel build dependency to 1.6.3.
* Sat May 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 8.1-0.lvn.1
- 8.1.
* Fri Dec 31 2004 Ville Skyttä <ville.skytta at iki.fi> - 0.6.2-0.lvn.1
- First build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/y4mscaler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Aug 2008 08:48:40 -0000 1.1
+++ .cvsignore 9 Aug 2008 08:52:36 -0000 1.2
@@ -0,0 +1 @@
+y4mscaler-9.0-src.tgz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/y4mscaler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Aug 2008 08:48:40 -0000 1.1
+++ sources 9 Aug 2008 08:52:36 -0000 1.2
@@ -0,0 +1 @@
+6b5d110aeacb22b865591e6203666195 y4mscaler-9.0-src.tgz
16 years, 2 months
rpms/compat-python24-libxml2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/compat-python24-libxml2/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsu26211/rpms/compat-python24-libxml2/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module compat-python24-libxml2
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: compat-python24-libxml2
# $Id: Makefile,v 1.1 2008/08/09 08:49:41 thl Exp $
NAME := compat-python24-libxml2
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
16 years, 2 months
rpms/compat-python24-libxml2 Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/compat-python24-libxml2
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsu26211/rpms/compat-python24-libxml2
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module compat-python24-libxml2
--- NEW FILE Makefile ---
# Top level Makefile for module compat-python24-libxml2
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
16 years, 2 months
rpms/compat-python24-libxml2/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/compat-python24-libxml2/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsu26211/rpms/compat-python24-libxml2/devel
Log Message:
Directory /cvs/free/rpms/compat-python24-libxml2/devel added to the repository
16 years, 2 months
rpms/compat-python24-libxml2 - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/compat-python24-libxml2
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsu26211/rpms/compat-python24-libxml2
Log Message:
Directory /cvs/free/rpms/compat-python24-libxml2 added to the repository
16 years, 2 months
rpms/ffmpeg-compat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/ffmpeg-compat/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsT26033/rpms/ffmpeg-compat/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module ffmpeg-compat
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: ffmpeg-compat
# $Id: Makefile,v 1.1 2008/08/09 08:48:58 thl Exp $
NAME := ffmpeg-compat
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
16 years, 2 months
rpms/ffmpeg-compat Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/ffmpeg-compat
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsT26033/rpms/ffmpeg-compat
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module ffmpeg-compat
--- NEW FILE Makefile ---
# Top level Makefile for module ffmpeg-compat
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
16 years, 2 months