rpms/mplayer/F-9 mplayer-config.patch, NONE, 1.1 mplayer-dvdread.patch, NONE, 1.1 mplayer-man-zh_CN.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 Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27662
Modified Files:
.cvsignore sources
Added Files:
mplayer-config.patch mplayer-dvdread.patch
mplayer-man-zh_CN.patch mplayer-manlinks.patch
mplayer-qcelp.patch mplayer-x86_32-compile.patch mplayer.spec
Log Message:
- initial import into F-9 branch (backport from devel + fixes)
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-dvdread.patch:
--- NEW FILE mplayer-dvdread.patch ---
diff -up mplayer-export-2008-08-18/configure.dvdread mplayer-export-2008-08-18/configure
--- mplayer-export-2008-08-18/configure.dvdread 2008-08-18 00:02:05.000000000 +0200
+++ mplayer-export-2008-08-18/configure 2008-08-18 22:47:42.000000000 +0200
@@ -5458,10 +5458,10 @@ elif test "$_dvdread" = auto ; then
if test "$_dl" = yes; then
cat > $TMPC << EOF
#include <inttypes.h>
-#include <libdvdread/dvd_reader.h>
-#include <libdvdread/ifo_types.h>
-#include <libdvdread/ifo_read.h>
-#include <libdvdread/nav_read.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
int main(void) { return 0; }
EOF
fi
diff -up mplayer-export-2008-08-18/stream/stream_dvd_common.c.dvdread mplayer-export-2008-08-18/stream/stream_dvd_common.c
--- mplayer-export-2008-08-18/stream/stream_dvd_common.c.dvdread 2008-07-30 14:01:30.000000000 +0200
+++ mplayer-export-2008-08-18/stream/stream_dvd_common.c 2008-08-18 22:49:46.000000000 +0200
@@ -1,10 +1,6 @@
#include "config.h"
#include <inttypes.h>
-#ifdef CONFIG_DVDREAD_INTERNAL
#include <dvdread/ifo_types.h>
-#else
-#include <libdvdread/ifo_types.h>
-#endif
#include "stream_dvd_common.h"
/**
diff -up mplayer-export-2008-08-18/stream/stream_dvd_common.h.dvdread mplayer-export-2008-08-18/stream/stream_dvd_common.h
--- mplayer-export-2008-08-18/stream/stream_dvd_common.h.dvdread 2008-07-30 14:01:30.000000000 +0200
+++ mplayer-export-2008-08-18/stream/stream_dvd_common.h 2008-08-18 22:50:11.000000000 +0200
@@ -3,11 +3,7 @@
#include "config.h"
#include <inttypes.h>
-#ifdef CONFIG_DVDREAD_INTERNAL
#include <dvdread/ifo_types.h>
-#else
-#include <libdvdread/ifo_types.h>
-#endif
int mp_dvdtimetomsec(dvd_time_t *dt);
diff -up mplayer-export-2008-08-18/stream/stream_dvd.h.dvdread mplayer-export-2008-08-18/stream/stream_dvd.h
--- mplayer-export-2008-08-18/stream/stream_dvd.h.dvdread 2008-07-30 14:01:30.000000000 +0200
+++ mplayer-export-2008-08-18/stream/stream_dvd.h 2008-08-18 22:50:47.000000000 +0200
@@ -9,10 +9,10 @@
#include "dvdread/ifo_read.h"
#include "dvdread/nav_read.h"
#else
-#include <libdvdread/dvd_reader.h>
-#include <libdvdread/ifo_types.h>
-#include <libdvdread/ifo_read.h>
-#include <libdvdread/nav_read.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
#endif
#include "stream.h"
mplayer-man-zh_CN.patch:
--- NEW FILE mplayer-man-zh_CN.patch ---
diff -up mplayer-export-2008-08-18/configure.man-zh_CN mplayer-export-2008-08-18/configure
--- mplayer-export-2008-08-18/configure.man-zh_CN 2008-08-18 22:53:34.000000000 +0200
+++ mplayer-export-2008-08-18/configure 2008-08-18 23:33:58.000000000 +0200
@@ -185,7 +185,7 @@ case `echo -n` in
esac
msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"`
-man_lang_all=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"`
+man_lang_all=`echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g"`
doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"`
show_help(){
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 20080818svn
%define svn 1
%define svnbuild 2008-08-18
%define svnrev 27470
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
Release: 0.96.%{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
Patch11: %{name}-dvdread.patch
Patch12: %{name}-man-zh_CN.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: libXScrnSaver-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.2
BuildRequires: libjpeg-devel
BuildRequires: libmpcdec-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: lirc-devel
BuildRequires: live555-devel
BuildRequires: lzo-devel >= 2
BuildRequires: pulseaudio-lib-devel
BuildRequires: speex-devel >= 1.1
BuildRequires: twolame-devel
BuildRequires: x264-devel
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
%patch11 -p1 -b .dvdread
%patch12 -p1 -b .man-zh_CN
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
# remove internal libdvdread copy to avoid clashes
rm -r dvdread
%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-faac-lavc \
--disable-mp3lame-lavc \
--disable-x264-lavc \
\
--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
# parallel make fails in vidix
#%{__make} %{?_smp_mflags}
%{__make}
mv -f mplayer gmplayer
%{__make} distclean
./configure \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
--datadir=%{_datadir}/mplayer \
--mandir=%{_mandir} \
--confdir=%{_sysconfdir}/mplayer \
--libdir=%{_libdir} \
--codecsdir=%{codecdir} \
\
--disable-faac-lavc \
--disable-mp3lame-lavc \
--disable-x264-lavc \
\
--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
# parallel make fails in vidix
#%{__make} %{?_smp_mflags}
%{__make}
%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
for file in aconvert.sh midentify.sh ; do
install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/
done
# 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}/aconvert.sh
%{_bindir}/midentify.sh
%{_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
* Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.96.20080818svn
- updated to latest SVN snapshot
- dropped obsolete patches
- fixed build with libdvdread 4.1.2
- installed aconvert.sh to bindir
- fixed zh_CN manpage installation
* Sun Aug 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.95.20080531svn
- rebuild against shared live555
- add missing libXScrnSaver-devel BR
- fixed audio in some rtsp streams (backport from SVN)
* Wed Jun 04 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.94.20080531svn
- 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)
* 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/F-9/.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 19 Aug 2008 00:08:33 -0000 1.2
@@ -0,0 +1,2 @@
+Blue-1.7.tar.bz2
+mplayer-export-2008-08-18.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-9/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 19 Aug 2008 00:08:33 -0000 1.2
@@ -0,0 +1,2 @@
+e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
+f09caa71435c9c8818c2f681722042a7 mplayer-export-2008-08-18.tar.bz2
16 years, 3 months
rpms/mplayer/devel mplayer-man-zh_CN.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mplayer.spec, 1.2, 1.3 sources, 1.2, 1.3 mplayer-r27449.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27532
Modified Files:
.cvsignore mplayer.spec sources
Added Files:
mplayer-man-zh_CN.patch
Removed Files:
mplayer-r27449.patch
Log Message:
* Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn
- updated to latest SVN snapshot
- dropped obsolete patches
- installed aconvert.sh to bindir
- fixed zh_CN manpage installation
mplayer-man-zh_CN.patch:
--- NEW FILE mplayer-man-zh_CN.patch ---
diff -up mplayer-export-2008-08-18/configure.man-zh_CN mplayer-export-2008-08-18/configure
--- mplayer-export-2008-08-18/configure.man-zh_CN 2008-08-18 22:53:34.000000000 +0200
+++ mplayer-export-2008-08-18/configure 2008-08-18 23:33:58.000000000 +0200
@@ -185,7 +185,7 @@ case `echo -n` in
esac
msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"`
-man_lang_all=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"`
+man_lang_all=`echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g"`
doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"`
show_help(){
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Aug 2008 09:32:32 -0000 1.2
+++ .cvsignore 19 Aug 2008 00:06:56 -0000 1.3
@@ -1,2 +1,2 @@
Blue-1.7.tar.bz2
-mplayer-export-2008-06-13.tar.bz2
+mplayer-export-2008-08-18.tar.bz2
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer.spec 17 Aug 2008 21:48:07 -0000 1.2
+++ mplayer.spec 19 Aug 2008 00:06:57 -0000 1.3
@@ -1,13 +1,13 @@
%define codecdir %{_libdir}/codecs
-%define pre 20080613svn
+%define pre 20080818svn
%define svn 1
-%define svnbuild 2008-06-13
-%define svnrev 27055
+%define svnbuild 2008-08-18
+%define svnrev 27470
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.96.%{pre}%{?dist}
+Release: 0.97.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -23,7 +23,7 @@
Patch5: %{name}-x86_32-compile.patch
Patch8: %{name}-manlinks.patch
Patch10: %{name}-qcelp.patch
-Patch11: %{name}-r27449.patch
+Patch12: %{name}-man-zh_CN.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -144,7 +144,7 @@
%patch5 -p1 -b .compile
%patch8 -p1 -b .manlinks
%patch10 -p1 -b .qclp
-%patch11 -p0
+%patch12 -p1 -b .man-zh_CN
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -172,9 +172,9 @@
--libdir=%{_libdir} \
--codecsdir=%{codecdir} \
\
- --disable-encoder=FAAC \
- --disable-encoder=MP3LAME \
- --disable-encoder=X264 \
+ --disable-faac-lavc \
+ --disable-mp3lame-lavc \
+ --disable-x264-lavc \
\
--enable-gui \
--enable-largefiles \
@@ -226,9 +226,9 @@
--libdir=%{_libdir} \
--codecsdir=%{codecdir} \
\
- --disable-encoder=FAAC \
- --disable-encoder=MP3LAME \
- --disable-encoder=X264 \
+ --disable-faac-lavc \
+ --disable-mp3lame-lavc \
+ --disable-x264-lavc \
\
--enable-largefiles \
--enable-unrarexec \
@@ -278,7 +278,9 @@
rm -rf $RPM_BUILD_ROOT doc
make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no
-install -pm 755 TOOLS/midentify $RPM_BUILD_ROOT%{_bindir}/
+for file in aconvert.sh midentify.sh ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/
+done
# Clean up documentation
mkdir doc
@@ -341,7 +343,8 @@
%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
%config(noreplace) %{_sysconfdir}/mplayer/input.conf
%config(noreplace) %{_sysconfdir}/mplayer/menu.conf
-%{_bindir}/midentify
+%{_bindir}/aconvert.sh
+%{_bindir}/midentify.sh
%{_bindir}/mplayer
%dir %{codecdir}/
%dir %{_datadir}/mplayer/
@@ -391,6 +394,12 @@
%changelog
+* Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn
+- updated to latest SVN snapshot
+- dropped obsolete patches
+- installed aconvert.sh to bindir
+- fixed zh_CN manpage installation
+
* Sun Aug 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.96.20080613svn
- live-devel is now live555-devel
- added missing libXScrnSaver-devel BR
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Aug 2008 09:32:32 -0000 1.2
+++ sources 19 Aug 2008 00:06:57 -0000 1.3
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-86fe793e1f0dccc48b97cf39c8e232c3 mplayer-export-2008-06-13.tar.bz2
+f09caa71435c9c8818c2f681722042a7 mplayer-export-2008-08-18.tar.bz2
--- mplayer-r27449.patch DELETED ---
16 years, 3 months
rpms/live555/F-8 live.2008.02.08-shared.patch, NONE, 1.1 live.2008.04.03-reorder.patch, NONE, 1.1 live555.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/live555/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29010
Modified Files:
.cvsignore sources
Added Files:
live.2008.02.08-shared.patch live.2008.04.03-reorder.patch
live555.spec
Log Message:
- initial import into F-8 branch (copied from devel)
live.2008.02.08-shared.patch:
--- NEW FILE live.2008.02.08-shared.patch ---
diff -up live/config.linux.shared live/config.linux
--- live/config.linux.shared 2008-04-23 17:09:41.000000000 +0200
+++ live/config.linux 2008-04-23 17:12:00.000000000 +0200
@@ -9,9 +9,9 @@ OBJ = o
LINK = c++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ar rcvu
-LIBRARY_LINK_OPTS =
-LIB_SUFFIX = a
+LIBRARY_LINK = $(CC) -o
+LIBRARY_LINK_OPTS = $(LINK_OPTS) -shared -Wl,-soname,$@.$(SO_VERSION) $(LIBADDS)
+LIB_SUFFIX = so
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
EXE =
live.2008.04.03-reorder.patch:
--- NEW FILE live.2008.04.03-reorder.patch ---
diff -up live/Makefile.tail.reorder live/Makefile.tail
--- live/Makefile.tail.reorder 2008-04-24 01:42:06.000000000 +0200
+++ live/Makefile.tail 2008-04-24 01:48:48.000000000 +0200
@@ -15,10 +15,10 @@ TESTPROGS_APP = $(TESTPROGS_DIR)/testMP3
MEDIA_SERVER_DIR = mediaServer
MEDIA_SERVER_APP = $(MEDIA_SERVER_DIR)/mediaServer$(EXE)
-ALL = $(LIVEMEDIA_LIB) \
- $(GROUPSOCK_LIB) \
+ALL = $(BASIC_USAGE_ENVIRONMENT_LIB) \
$(USAGE_ENVIRONMENT_LIB) \
- $(BASIC_USAGE_ENVIRONMENT_LIB) \
+ $(GROUPSOCK_LIB) \
+ $(LIVEMEDIA_LIB) \
$(TESTPROGS_APP) \
$(MEDIA_SERVER_APP)
all: $(ALL)
--- NEW FILE live555.spec ---
%define date 2008.07.25
%define live_soversion 0
Name: live555
Version: 0
Release: 0.20.%{date}%{?dist}
Summary: Live555.com streaming libraries
Group: System Environment/Libraries
License: LGPLv2+
URL: http://live555.com/liveMedia/
Source0: http://live555.com/liveMedia/public/live.%{date}.tar.gz
# http://live555.com/liveMedia/public/changelog.txt
Source1: changelog.txt
Patch0: http://ftp.debian.org/debian/pool/main/libl/liblivemedia/liblivemedia_200...
Patch1: live.2008.02.08-shared.patch
Patch2: live.2008.04.03-reorder.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
This code forms a set of C++ libraries for multimedia streaming,
using open standard protocols (RTP/RTCP, RTSP, SIP). These
libraries - which can be compiled for Unix (including Linux and Mac OS X),
Windows, and QNX (and other POSIX-compliant systems) - can be used
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG,
H.263+ or JPEG video, and several audio codecs. They can easily be
extended to support additional (audio and/or video) codecs, and can
also be used to build basic RTSP or SIP clients and servers, and have
been used to add streaming support to existing media player applications.
%package devel
Summary: Development files for live555.com streaming libraries
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: live-devel < 0-0.19.2008.04.03
Provides: live-devel = %{version}-%{release}
%description devel
This code forms a set of C++ libraries for multimedia streaming,
using open standard protocols (RTP/RTCP, RTSP, SIP). These
libraries - which can be compiled for Unix (including Linux and Mac OS X),
Windows, and QNX (and other POSIX-compliant systems) - can be used
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG,
H.263+ or JPEG video, and several audio codecs. They can easily be
extended to support additional (audio and/or video) codecs, and can
also be used to build basic RTSP or SIP clients and servers, and have
been used to add streaming support to existing media player applications.
%package tools
Summary: RTSP streaming tools using live555.com streaming libraries
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Obsoletes: live-tools < 0-0.19.2008.04.03
Provides: live-tools = %{version}-%{release}
%description tools
This code forms a set of C++ libraries for multimedia streaming,
using open standard protocols (RTP/RTCP, RTSP, SIP). These
libraries - which can be compiled for Unix (including Linux and Mac OS X),
Windows, and QNX (and other POSIX-compliant systems) - can be used
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG,
H.263+ or JPEG video, and several audio codecs. They can easily be
extended to support additional (audio and/or video) codecs, and can
also be used to build basic RTSP or SIP clients and servers, and have
been used to add streaming support to existing media player applications.
This package contains the live555.com streaming server
(live555MediaServer), the example programs (openRTSP, playSIP, sapWatch,
vobStreamer) and a variety of test tools.
%package static
Summary: Static libraries for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
The %{name}-static package contains static libraries for
developing applications that use %{name}.
%prep
%setup -q -n live
%patch0 -p1
patch -p1 -i debian/patches/010_propagate_cflags.diff
patch -p1 -i debian/patches/010_proper_link_order.diff
patch -p1 -i debian/patches/010_static_link.diff
patch -p1 -i debian/patches/020_cxx_headers.diff
patch -p1 -i debian/patches/020_invalid_casts.diff
patch -p1 -i debian/patches/021_ip_mreq_source.diff
cp -p %{SOURCE1} .
%patch1 -p1 -b .static
%patch2 -p1 -b .reorder
%build
./genMakefiles %{_target_os}.static
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
rename .a _pic.a */*.a
mv $(find BasicUsageEnvironment groupsock liveMedia UsageEnvironment -name "*.a" ) $(pwd)
make clean
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
mv $(find BasicUsageEnvironment groupsock liveMedia UsageEnvironment -name "*.a" ) $(pwd)
make clean
# Hack to prevent undefined-non-weak-symbol
for i in groupsock liveMedia ; do
pushd $i
LIBADD="-lstdc++ -lpthread"
for j in BasicUsageEnvironment groupsock liveMedia UsageEnvironment ; do
if [ $(grep $j Makefile.head |wc -l) = 1 ] ; then
LIBADD="$LIBADD -L../${j} -l${j}"
fi
done
echo -e LIBADDS = " $LIBADD " >> Makefile.head
popd
pushd UsageEnvironment
echo -e LIBADDS = -lstdc++ -L../BasicUsageEnvironment -lBasicUsageEnvironment >> Makefile.head
popd
pushd BasicUsageEnvironment
echo -e LIBADDS = -lstdc++ -lpthread >> Makefile.head
popd
done
./genMakefiles %{_target_os}
make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" SO_VERSION="%{live_soversion}"
# Hack to fix the circle dependency - we leave the safe parallele work here.
pushd BasicUsageEnvironment
rm *.so
make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" SO_VERSION="%{live_soversion}" \
LIBADDS="-lstdc++ -lpthread -L../UsageEnvironment -lUsageEnvironment"
popd
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
for i in BasicUsageEnvironment groupsock liveMedia UsageEnvironment ; do
install -dm 755 $RPM_BUILD_ROOT%{_includedir}/$i
install -pm 644 $i/include/*.h* $RPM_BUILD_ROOT%{_includedir}/$i/
install -pm 644 lib${i}.a $RPM_BUILD_ROOT%{_libdir}/lib${i}.a
install -pm 644 lib${i}_pic.a $RPM_BUILD_ROOT%{_libdir}/lib${i}_pic.a
install -pm 755 $i/lib${i}.so $RPM_BUILD_ROOT%{_libdir}/lib${i}.so.%{date}
ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so.%{live_soversion}
ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so
done
install -pm755 mediaServer/live555MediaServer $RPM_BUILD_ROOT%{_bindir}
pushd testProgs
for i in \
MPEG2TransportStreamIndexer \
openRTSP \
playSIP \
sapWatch \
testAMRAudioStreamer \
testMP3Receiver \
testMP3Streamer \
testMPEG1or2AudioVideoStreamer \
testMPEG1or2AudioVideoToDarwin \
testMPEG1or2ProgramToTransportStream \
testMPEG1or2Splitter \
testMPEG1or2VideoReceiver \
testMPEG1or2VideoStreamer \
testMPEG2TransportStreamTrickPlay \
testMPEG2TransportStreamer \
testMPEG4VideoStreamer \
testMPEG4VideoToDarwin \
testOnDemandRTSPServer \
testRelay \
testWAVAudioStreamer \
vobStreamer \
; do
install -pm755 $i $RPM_BUILD_ROOT%{_bindir}
done
popd
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_libdir}/libBasicUsageEnvironment.so.*
%{_libdir}/libgroupsock.so.*
%{_libdir}/libliveMedia.so.*
%{_libdir}/libUsageEnvironment.so.*
%files tools
%defattr(-,root,root,-)
%{_bindir}/*
%files devel
%defattr(-,root,root,-)
%doc COPYING README changelog.txt
%{_libdir}/libBasicUsageEnvironment.so
%{_libdir}/libgroupsock.so
%{_libdir}/libliveMedia.so
%{_libdir}/libUsageEnvironment.so
%{_includedir}/BasicUsageEnvironment/
%{_includedir}/groupsock/
%{_includedir}/liveMedia/
%{_includedir}/UsageEnvironment/
%files static
%defattr(-,root,root,644)
%{_libdir}/libBasicUsageEnvironment*.a
%{_libdir}/libgroupsock*.a
%{_libdir}/libliveMedia*.a
%{_libdir}/libUsageEnvironment*.a
%changelog
* Sun Aug 17 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.20.2008.07.25
- 2008.07.25
- devel-static -> static, per Fedora guidelines
- specfile whitespace cosmetics
- made tools depend on specific version until we have a stable ABI
- added proper obsoletes/provides to devel
- made -tools binaries installation independent of umask
* Mon May 5 2008 kwizart < kwizart at gmail.com > - 0-0.19.2008.04.03
- Rename package from live to live555
(live555-devel-static provides live-devel for compat)
- Enable shared build
- Split static pic and nopic into devel-static
* Sun Apr 06 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.18.2008.04.03
- 2008.04.03
* Sun Feb 24 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.17.2008.02.08
- 2008.02.08
- added tools subpackage
* Sat Dec 01 2007 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.16.2007.11.18
- 2007.11.18
- fix CVE-2007-6036 (bug #1728)
- fix license tag
- store changelog.txt locally, because the one on the website is constantly updated
* Sun May 17 2007 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.15.2007.04.24a
- 2007.04.24a
- use Debian patches
* Mon Sep 25 2006 Dams <anvil[AT]livna.org> - 0-0.13.2006.08.07%{?dist}
- Release bump
* Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.12.2006.08.07
- changelog.txt changed upstream :(
* Thu Aug 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.11.2006.08.07
- 2006.08.07.
- Drop no longer needed live Obsoletes and Provides.
- Install into usual system locations, ship both PIC and non-PIC libs
(from Debian).
* Thu Jun 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.11.2006.06.22
- 2006.06.22.
- Re-enable parallel make.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- add another 0 for switch cvs -> release
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Feb 23 2006 Ville Skyttä <ville.skytta at iki.fi> 0-0.lvn.11.2006.02.15
- Update to 2006.02.15.
* Mon Jan 16 2006 Adrian Reber <adrian(a)lisas.de> - 0-0.lvn.11.2006.01.05
- Updated to 2006.01.05
- Drop Epoch
* Tue Aug 9 2005 Ville Skyttä <ville.skytta at iki.fi> 0:0-0.lvn.10.2005.08.09
- 2005.08.09.
- Rename binary package to -devel.
- Ship changelog.txt.
- Clean up unused stuff from specfile.
* Tue Dec 28 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.10.2004.12.23
- Updated to version 2004.12.23
* Fri Nov 12 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.9.2004.11.11a
- Updated to version 2004.11.11a
* Thu May 20 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.8.2004.05.19
- Added Source1:changelog.txt
* Thu May 20 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.7.2004.05.19
- Updated version
- URL in Source0
* Sun Apr 4 2004 Dams <anvil[AT]livna.org> 0:0-0.lvn.6.2004.03.31
- Removed testprograms package
* Wed Mar 31 2004 Dams <anvil[AT]livna.org> 0:0-0.lvn.5.2004.03.31
- Updated version 2004-03-31
* Wed Jan 7 2004 Dams <anvil[AT]livna.org> 0:0-0.fdr.4.2003.11.25
- Patch from Marius to make makefile honor rpm optflags
- Removed URL in Source0
* Wed Jan 7 2004 Dams <anvil[AT]livna.org> 0:0-0.fdr.3.2003.11.25
- Removed all .o files
* Fri Dec 12 2003 Dams <anvil[AT]livna.org> 0:0-0.fdr.2.2003.11.25
- Snipped the devel pacakge.
* Fri Dec 12 2003 Dams <anvil[AT]livna.org> 0:0-0.fdr.1.2003.11.25
- Version-Release respecting fedora.us guidelines
- Spec file cleanup.
* Sat Nov 29 2003 Peter Backlund <peter dot backlund at home dot se> - 0:0.0.2003.11.25-0.fdr.1
- Added 0.0. to version, to allow for upgrade to 0.x/1.x release
* Sat Nov 29 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.25-0.fdr.1
- New upstream release
* Sun Nov 16 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.14-0.fdr.2
- Removed unnecessary BuildReq.
- Removed smp job macro.
- Replaced sed with perl.
* Fri Nov 14 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.14-0.fdr.1
- Initial RPM release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/live555/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 17 Aug 2008 16:33:43 -0000 1.1
+++ .cvsignore 18 Aug 2008 14:26:42 -0000 1.2
@@ -0,0 +1,3 @@
+live.2008.07.25.tar.gz
+changelog.txt
+liblivemedia_2007.02.20-2.diff.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/live555/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 17 Aug 2008 16:33:43 -0000 1.1
+++ sources 18 Aug 2008 14:26:42 -0000 1.2
@@ -0,0 +1,3 @@
+32e7bd2fdb04d0b05462b24d42409ec7 live.2008.07.25.tar.gz
+4bf8822d97282bd99a8b1cde8e6da84e changelog.txt
+09a40aa249d1598923a68b35d6fcb5ea liblivemedia_2007.02.20-2.diff.gz
16 years, 3 months
rpms/live555/F-9 live.2008.02.08-shared.patch, NONE, 1.1 live.2008.04.03-reorder.patch, NONE, 1.1 live555.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/live555/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28701
Modified Files:
.cvsignore sources
Added Files:
live.2008.02.08-shared.patch live.2008.04.03-reorder.patch
live555.spec
Log Message:
- initial import into F-9 branch (copied from devel)
live.2008.02.08-shared.patch:
--- NEW FILE live.2008.02.08-shared.patch ---
diff -up live/config.linux.shared live/config.linux
--- live/config.linux.shared 2008-04-23 17:09:41.000000000 +0200
+++ live/config.linux 2008-04-23 17:12:00.000000000 +0200
@@ -9,9 +9,9 @@ OBJ = o
LINK = c++ -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ar rcvu
-LIBRARY_LINK_OPTS =
-LIB_SUFFIX = a
+LIBRARY_LINK = $(CC) -o
+LIBRARY_LINK_OPTS = $(LINK_OPTS) -shared -Wl,-soname,$@.$(SO_VERSION) $(LIBADDS)
+LIB_SUFFIX = so
LIBS_FOR_CONSOLE_APPLICATION =
LIBS_FOR_GUI_APPLICATION =
EXE =
live.2008.04.03-reorder.patch:
--- NEW FILE live.2008.04.03-reorder.patch ---
diff -up live/Makefile.tail.reorder live/Makefile.tail
--- live/Makefile.tail.reorder 2008-04-24 01:42:06.000000000 +0200
+++ live/Makefile.tail 2008-04-24 01:48:48.000000000 +0200
@@ -15,10 +15,10 @@ TESTPROGS_APP = $(TESTPROGS_DIR)/testMP3
MEDIA_SERVER_DIR = mediaServer
MEDIA_SERVER_APP = $(MEDIA_SERVER_DIR)/mediaServer$(EXE)
-ALL = $(LIVEMEDIA_LIB) \
- $(GROUPSOCK_LIB) \
+ALL = $(BASIC_USAGE_ENVIRONMENT_LIB) \
$(USAGE_ENVIRONMENT_LIB) \
- $(BASIC_USAGE_ENVIRONMENT_LIB) \
+ $(GROUPSOCK_LIB) \
+ $(LIVEMEDIA_LIB) \
$(TESTPROGS_APP) \
$(MEDIA_SERVER_APP)
all: $(ALL)
--- NEW FILE live555.spec ---
%define date 2008.07.25
%define live_soversion 0
Name: live555
Version: 0
Release: 0.20.%{date}%{?dist}
Summary: Live555.com streaming libraries
Group: System Environment/Libraries
License: LGPLv2+
URL: http://live555.com/liveMedia/
Source0: http://live555.com/liveMedia/public/live.%{date}.tar.gz
# http://live555.com/liveMedia/public/changelog.txt
Source1: changelog.txt
Patch0: http://ftp.debian.org/debian/pool/main/libl/liblivemedia/liblivemedia_200...
Patch1: live.2008.02.08-shared.patch
Patch2: live.2008.04.03-reorder.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
This code forms a set of C++ libraries for multimedia streaming,
using open standard protocols (RTP/RTCP, RTSP, SIP). These
libraries - which can be compiled for Unix (including Linux and Mac OS X),
Windows, and QNX (and other POSIX-compliant systems) - can be used
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG,
H.263+ or JPEG video, and several audio codecs. They can easily be
extended to support additional (audio and/or video) codecs, and can
also be used to build basic RTSP or SIP clients and servers, and have
been used to add streaming support to existing media player applications.
%package devel
Summary: Development files for live555.com streaming libraries
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: live-devel < 0-0.19.2008.04.03
Provides: live-devel = %{version}-%{release}
%description devel
This code forms a set of C++ libraries for multimedia streaming,
using open standard protocols (RTP/RTCP, RTSP, SIP). These
libraries - which can be compiled for Unix (including Linux and Mac OS X),
Windows, and QNX (and other POSIX-compliant systems) - can be used
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG,
H.263+ or JPEG video, and several audio codecs. They can easily be
extended to support additional (audio and/or video) codecs, and can
also be used to build basic RTSP or SIP clients and servers, and have
been used to add streaming support to existing media player applications.
%package tools
Summary: RTSP streaming tools using live555.com streaming libraries
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Obsoletes: live-tools < 0-0.19.2008.04.03
Provides: live-tools = %{version}-%{release}
%description tools
This code forms a set of C++ libraries for multimedia streaming,
using open standard protocols (RTP/RTCP, RTSP, SIP). These
libraries - which can be compiled for Unix (including Linux and Mac OS X),
Windows, and QNX (and other POSIX-compliant systems) - can be used
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG,
H.263+ or JPEG video, and several audio codecs. They can easily be
extended to support additional (audio and/or video) codecs, and can
also be used to build basic RTSP or SIP clients and servers, and have
been used to add streaming support to existing media player applications.
This package contains the live555.com streaming server
(live555MediaServer), the example programs (openRTSP, playSIP, sapWatch,
vobStreamer) and a variety of test tools.
%package static
Summary: Static libraries for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
The %{name}-static package contains static libraries for
developing applications that use %{name}.
%prep
%setup -q -n live
%patch0 -p1
patch -p1 -i debian/patches/010_propagate_cflags.diff
patch -p1 -i debian/patches/010_proper_link_order.diff
patch -p1 -i debian/patches/010_static_link.diff
patch -p1 -i debian/patches/020_cxx_headers.diff
patch -p1 -i debian/patches/020_invalid_casts.diff
patch -p1 -i debian/patches/021_ip_mreq_source.diff
cp -p %{SOURCE1} .
%patch1 -p1 -b .static
%patch2 -p1 -b .reorder
%build
./genMakefiles %{_target_os}.static
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
rename .a _pic.a */*.a
mv $(find BasicUsageEnvironment groupsock liveMedia UsageEnvironment -name "*.a" ) $(pwd)
make clean
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
mv $(find BasicUsageEnvironment groupsock liveMedia UsageEnvironment -name "*.a" ) $(pwd)
make clean
# Hack to prevent undefined-non-weak-symbol
for i in groupsock liveMedia ; do
pushd $i
LIBADD="-lstdc++ -lpthread"
for j in BasicUsageEnvironment groupsock liveMedia UsageEnvironment ; do
if [ $(grep $j Makefile.head |wc -l) = 1 ] ; then
LIBADD="$LIBADD -L../${j} -l${j}"
fi
done
echo -e LIBADDS = " $LIBADD " >> Makefile.head
popd
pushd UsageEnvironment
echo -e LIBADDS = -lstdc++ -L../BasicUsageEnvironment -lBasicUsageEnvironment >> Makefile.head
popd
pushd BasicUsageEnvironment
echo -e LIBADDS = -lstdc++ -lpthread >> Makefile.head
popd
done
./genMakefiles %{_target_os}
make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" SO_VERSION="%{live_soversion}"
# Hack to fix the circle dependency - we leave the safe parallele work here.
pushd BasicUsageEnvironment
rm *.so
make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" SO_VERSION="%{live_soversion}" \
LIBADDS="-lstdc++ -lpthread -L../UsageEnvironment -lUsageEnvironment"
popd
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
for i in BasicUsageEnvironment groupsock liveMedia UsageEnvironment ; do
install -dm 755 $RPM_BUILD_ROOT%{_includedir}/$i
install -pm 644 $i/include/*.h* $RPM_BUILD_ROOT%{_includedir}/$i/
install -pm 644 lib${i}.a $RPM_BUILD_ROOT%{_libdir}/lib${i}.a
install -pm 644 lib${i}_pic.a $RPM_BUILD_ROOT%{_libdir}/lib${i}_pic.a
install -pm 755 $i/lib${i}.so $RPM_BUILD_ROOT%{_libdir}/lib${i}.so.%{date}
ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so.%{live_soversion}
ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so
done
install -pm755 mediaServer/live555MediaServer $RPM_BUILD_ROOT%{_bindir}
pushd testProgs
for i in \
MPEG2TransportStreamIndexer \
openRTSP \
playSIP \
sapWatch \
testAMRAudioStreamer \
testMP3Receiver \
testMP3Streamer \
testMPEG1or2AudioVideoStreamer \
testMPEG1or2AudioVideoToDarwin \
testMPEG1or2ProgramToTransportStream \
testMPEG1or2Splitter \
testMPEG1or2VideoReceiver \
testMPEG1or2VideoStreamer \
testMPEG2TransportStreamTrickPlay \
testMPEG2TransportStreamer \
testMPEG4VideoStreamer \
testMPEG4VideoToDarwin \
testOnDemandRTSPServer \
testRelay \
testWAVAudioStreamer \
vobStreamer \
; do
install -pm755 $i $RPM_BUILD_ROOT%{_bindir}
done
popd
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_libdir}/libBasicUsageEnvironment.so.*
%{_libdir}/libgroupsock.so.*
%{_libdir}/libliveMedia.so.*
%{_libdir}/libUsageEnvironment.so.*
%files tools
%defattr(-,root,root,-)
%{_bindir}/*
%files devel
%defattr(-,root,root,-)
%doc COPYING README changelog.txt
%{_libdir}/libBasicUsageEnvironment.so
%{_libdir}/libgroupsock.so
%{_libdir}/libliveMedia.so
%{_libdir}/libUsageEnvironment.so
%{_includedir}/BasicUsageEnvironment/
%{_includedir}/groupsock/
%{_includedir}/liveMedia/
%{_includedir}/UsageEnvironment/
%files static
%defattr(-,root,root,644)
%{_libdir}/libBasicUsageEnvironment*.a
%{_libdir}/libgroupsock*.a
%{_libdir}/libliveMedia*.a
%{_libdir}/libUsageEnvironment*.a
%changelog
* Sun Aug 17 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.20.2008.07.25
- 2008.07.25
- devel-static -> static, per Fedora guidelines
- specfile whitespace cosmetics
- made tools depend on specific version until we have a stable ABI
- added proper obsoletes/provides to devel
- made -tools binaries installation independent of umask
* Mon May 5 2008 kwizart < kwizart at gmail.com > - 0-0.19.2008.04.03
- Rename package from live to live555
(live555-devel-static provides live-devel for compat)
- Enable shared build
- Split static pic and nopic into devel-static
* Sun Apr 06 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.18.2008.04.03
- 2008.04.03
* Sun Feb 24 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.17.2008.02.08
- 2008.02.08
- added tools subpackage
* Sat Dec 01 2007 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.16.2007.11.18
- 2007.11.18
- fix CVE-2007-6036 (bug #1728)
- fix license tag
- store changelog.txt locally, because the one on the website is constantly updated
* Sun May 17 2007 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.15.2007.04.24a
- 2007.04.24a
- use Debian patches
* Mon Sep 25 2006 Dams <anvil[AT]livna.org> - 0-0.13.2006.08.07%{?dist}
- Release bump
* Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.12.2006.08.07
- changelog.txt changed upstream :(
* Thu Aug 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.11.2006.08.07
- 2006.08.07.
- Drop no longer needed live Obsoletes and Provides.
- Install into usual system locations, ship both PIC and non-PIC libs
(from Debian).
* Thu Jun 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.11.2006.06.22
- 2006.06.22.
- Re-enable parallel make.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- add another 0 for switch cvs -> release
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Feb 23 2006 Ville Skyttä <ville.skytta at iki.fi> 0-0.lvn.11.2006.02.15
- Update to 2006.02.15.
* Mon Jan 16 2006 Adrian Reber <adrian(a)lisas.de> - 0-0.lvn.11.2006.01.05
- Updated to 2006.01.05
- Drop Epoch
* Tue Aug 9 2005 Ville Skyttä <ville.skytta at iki.fi> 0:0-0.lvn.10.2005.08.09
- 2005.08.09.
- Rename binary package to -devel.
- Ship changelog.txt.
- Clean up unused stuff from specfile.
* Tue Dec 28 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.10.2004.12.23
- Updated to version 2004.12.23
* Fri Nov 12 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.9.2004.11.11a
- Updated to version 2004.11.11a
* Thu May 20 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.8.2004.05.19
- Added Source1:changelog.txt
* Thu May 20 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.7.2004.05.19
- Updated version
- URL in Source0
* Sun Apr 4 2004 Dams <anvil[AT]livna.org> 0:0-0.lvn.6.2004.03.31
- Removed testprograms package
* Wed Mar 31 2004 Dams <anvil[AT]livna.org> 0:0-0.lvn.5.2004.03.31
- Updated version 2004-03-31
* Wed Jan 7 2004 Dams <anvil[AT]livna.org> 0:0-0.fdr.4.2003.11.25
- Patch from Marius to make makefile honor rpm optflags
- Removed URL in Source0
* Wed Jan 7 2004 Dams <anvil[AT]livna.org> 0:0-0.fdr.3.2003.11.25
- Removed all .o files
* Fri Dec 12 2003 Dams <anvil[AT]livna.org> 0:0-0.fdr.2.2003.11.25
- Snipped the devel pacakge.
* Fri Dec 12 2003 Dams <anvil[AT]livna.org> 0:0-0.fdr.1.2003.11.25
- Version-Release respecting fedora.us guidelines
- Spec file cleanup.
* Sat Nov 29 2003 Peter Backlund <peter dot backlund at home dot se> - 0:0.0.2003.11.25-0.fdr.1
- Added 0.0. to version, to allow for upgrade to 0.x/1.x release
* Sat Nov 29 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.25-0.fdr.1
- New upstream release
* Sun Nov 16 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.14-0.fdr.2
- Removed unnecessary BuildReq.
- Removed smp job macro.
- Replaced sed with perl.
* Fri Nov 14 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.14-0.fdr.1
- Initial RPM release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/live555/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 17 Aug 2008 16:33:43 -0000 1.1
+++ .cvsignore 18 Aug 2008 14:25:28 -0000 1.2
@@ -0,0 +1,3 @@
+live.2008.07.25.tar.gz
+changelog.txt
+liblivemedia_2007.02.20-2.diff.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/live555/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 17 Aug 2008 16:33:43 -0000 1.1
+++ sources 18 Aug 2008 14:25:28 -0000 1.2
@@ -0,0 +1,3 @@
+32e7bd2fdb04d0b05462b24d42409ec7 live.2008.07.25.tar.gz
+4bf8822d97282bd99a8b1cde8e6da84e changelog.txt
+09a40aa249d1598923a68b35d6fcb5ea liblivemedia_2007.02.20-2.diff.gz
16 years, 3 months
rpms/audacity-freeworld/devel audacity-freeworld.spec,1.2,1.3
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22618
Modified Files:
audacity-freeworld.spec
Log Message:
add provides and obsoletes -nonfree to create livna upgrade path
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audacity-freeworld.spec 17 Aug 2008 15:56:45 -0000 1.2
+++ audacity-freeworld.spec 18 Aug 2008 12:30:38 -0000 1.3
@@ -37,6 +37,9 @@
Patch113: audacity-1.3.2-libmp3lame-default.patch
Patch114: audacity-1.3.2-CVE-2007-6061.patch
+Provides: audacity-nonfree = %{version}-%{release}
+Obsoletes: audacity-nonfree < %{version}-%{release}
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
16 years, 3 months
rpms/live555/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 liblivemedia_2007.02.20-2.diff.gz, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/live555/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14589
Modified Files:
.cvsignore sources
Removed Files:
liblivemedia_2007.02.20-2.diff.gz
Log Message:
- move debian patch.gz to lookaside cache
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/live555/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 17 Aug 2008 21:54:41 -0000 1.2
+++ .cvsignore 18 Aug 2008 09:54:31 -0000 1.3
@@ -1,2 +1,3 @@
live.2008.07.25.tar.gz
changelog.txt
+liblivemedia_2007.02.20-2.diff.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/live555/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 17 Aug 2008 21:54:41 -0000 1.2
+++ sources 18 Aug 2008 09:54:31 -0000 1.3
@@ -1,2 +1,3 @@
32e7bd2fdb04d0b05462b24d42409ec7 live.2008.07.25.tar.gz
4bf8822d97282bd99a8b1cde8e6da84e changelog.txt
+09a40aa249d1598923a68b35d6fcb5ea liblivemedia_2007.02.20-2.diff.gz
--- liblivemedia_2007.02.20-2.diff.gz DELETED ---
16 years, 3 months
rpms/mythtv/devel mythplugins-0.21-svnfixes.patch, 1.1, 1.2 mythtv-0.21-svnfixes.patch, 1.1, 1.2 mythtv.spec, 1.1, 1.2
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20719
Modified Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
mythtv.spec
Log Message:
* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8
- Don't BR: libdvdcss-devel
- Update release-0-21-fixes patches (r18161)
- Rebuild for libraw1394 v2.0.0
mythplugins-0.21-svnfixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythplugins-0.21-svnfixes.patch
Index: mythplugins-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythplugins-0.21-svnfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythplugins-0.21-svnfixes.patch 3 Aug 2008 15:20:03 -0000 1.1
+++ mythplugins-0.21-svnfixes.patch 18 Aug 2008 01:26:30 -0000 1.2
@@ -1,3 +1,20 @@
+Index: mythplugins/mythweb/modules/music/stream.php
+===================================================================
+--- mythplugins/mythweb/modules/music/stream.php (revision 16468)
++++ mythplugins/mythweb/modules/music/stream.php (working copy)
+@@ -76,8 +76,11 @@
+ $mime = 'audio/mpeg';
+ break;
+ case 'ogg':
+- $mine = 'application/ogg';
++ $mime = 'application/ogg';
+ break;
++ case 'm4a':
++ $mime = 'audio/mp4a-latm';
++ break;
+ default:
+ $mime = 'application/octet-stream';
+ }
Index: mythplugins/mythweb/modules/_shared/lang/German.lang
===================================================================
--- mythplugins/mythweb/modules/_shared/lang/German.lang (revision 16468)
@@ -1510,10 +1527,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythmusic/i18n/mythmusic_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythmusic/i18n/mythmusic_nl.ts
===================================================================
--- mythplugins/mythmusic/i18n/mythmusic_nl.ts (revision 16468)
@@ -3785,6 +3798,76 @@
</message>
</context>
</TS>
+Index: mythplugins/mythmusic/mythmusic/miniplayer.cpp
+===================================================================
+--- mythplugins/mythmusic/mythmusic/miniplayer.cpp (revision 16468)
++++ mythplugins/mythmusic/mythmusic/miniplayer.cpp (working copy)
+@@ -72,6 +72,7 @@
+
+ void MiniPlayer::showPlayer(int showTime)
+ {
++ m_showTime = showTime;
+ m_displayTimer->start(showTime * 1000, true);
+ exec();
+ }
+@@ -294,6 +295,10 @@
+ else
+ handled = false;
+ }
++
++ // restart the display timer on any keypress if it is active
++ if (m_displayTimer->isActive())
++ m_displayTimer->start(m_showTime * 1000, true);
+ }
+ }
+
+Index: mythplugins/mythmusic/mythmusic/aacdecoder.cpp
+===================================================================
+--- mythplugins/mythmusic/mythmusic/aacdecoder.cpp (revision 16468)
++++ mythplugins/mythmusic/mythmusic/aacdecoder.cpp (working copy)
+@@ -19,6 +19,7 @@
+ #include <qobject.h>
+ #include <qiodevice.h>
+ #include <qfile.h>
++#include <stdlib.h>
+
+ #include "aacdecoder.h"
+ #include "constants.h"
+Index: mythplugins/mythmusic/mythmusic/databasebox.cpp
+===================================================================
+--- mythplugins/mythmusic/mythmusic/databasebox.cpp (revision 16468)
++++ mythplugins/mythmusic/mythmusic/databasebox.cpp (working copy)
+@@ -875,9 +875,15 @@
+
+ if (cdwriter)
+ {
++#if 0
++ /*
++ Disabled as Playlist::CreateCDAudio() is empty,
++ it is called by CreateCDAudio()
++ */
+ cdaudiob = active_popup->addButton(tr("Create Audio CD from "
+ "Playlist"), this,
+ SLOT(CreateCDAudio()));
++#endif
+
+ cdmp3b = active_popup->addButton(tr("Create MP3 CD from Playlist"),
+ this, SLOT(CreateCDMP3()));
+@@ -920,8 +926,12 @@
+ active_popup->addLabel(label2);
+
+ cdmp3b->setEnabled((ratio_MB <= 100.0));
+- cdaudiob->setEnabled((ratio_sec <= 100.0));
+- cdaudiob->setEnabled(false);
++
++ if (cdaudiob)
++ {
++ cdaudiob->setEnabled((ratio_sec <= 100.0));
++ cdaudiob->setEnabled(false);
++ }
+ }
+
+ (void)item_ptr;
Index: mythplugins/mythmusic/mythmusic/musicmenu.xml
===================================================================
--- mythplugins/mythmusic/mythmusic/musicmenu.xml (revision 16468)
@@ -3805,6 +3888,30 @@
<action>EJECT</action>
</button>
+Index: mythplugins/mythmusic/mythmusic/metaiomp4.cpp
+===================================================================
+--- mythplugins/mythmusic/mythmusic/metaiomp4.cpp (revision 16468)
++++ mythplugins/mythmusic/mythmusic/metaiomp4.cpp (working copy)
+@@ -3,6 +3,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <stdlib.h>
+
+ using namespace std;
+
+Index: mythplugins/mythmusic/mythmusic/miniplayer.h
+===================================================================
+--- mythplugins/mythmusic/mythmusic/miniplayer.h (revision 16468)
++++ mythplugins/mythmusic/mythmusic/miniplayer.h (working copy)
+@@ -52,6 +52,7 @@
+
+ QTimer *m_displayTimer;
+ QTimer *m_infoTimer;
++ int m_showTime;
+
+ bool m_showingInfo;
+
Index: mythplugins/mytharchive/i18n/mytharchive_fi.ts
===================================================================
--- mythplugins/mytharchive/i18n/mytharchive_fi.ts (revision 16468)
@@ -4434,10 +4541,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts
===================================================================
--- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468)
@@ -5329,10 +5432,6 @@
<source>Parental Pin:</source>
<translation>Pincode:</translation>
</message>
-Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mytharchive/mytharchive/archivemenu.xml
===================================================================
--- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468)
@@ -5421,7 +5520,117 @@
===================================================================
--- mythplugins/mytharchive/mytharchivehelper/main.cpp (revision 16468)
+++ mythplugins/mytharchive/mytharchivehelper/main.cpp (working copy)
-@@ -2185,7 +2185,14 @@
+@@ -2068,6 +2068,7 @@
+ root.appendChild(streams);
+ streams.setAttribute("count", inputFC->nb_streams);
+ int ffmpegIndex = 0;
++ uint duration = 0;
+
+ for (uint i = 0; i < inputFC->nb_streams; i++)
+ {
+@@ -2124,56 +2125,60 @@
+
+ streams.appendChild(stream);
+
+- uint duration = 0;
+-
+- switch (lenMethod)
++ // TODO: probably should add a better way to choose which
++ // video stream we use to calc the duration
++ if (duration == 0)
+ {
+- case 0:
++ switch (lenMethod)
+ {
+- // use duration guess from avformat
+- if (inputFC->duration != (uint) AV_NOPTS_VALUE)
++ case 0:
[...1781 lines suppressed...]
++#elif MINGW
++ QString filename = "dvd:"; // e.g. 'dvd:E\\'
++#else
++ QString filename = "dvd:/"; // e.g. 'dvd://dev/sda'
++#endif
++ filename += dvd_device;
+
+ command_string = "Internal";
+ gContext->GetMainWindow()->HandleMedia(command_string, filename);
Index: mythplugins/mythphone/i18n/mythphone_nl.ts
===================================================================
--- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468)
@@ -10672,10 +12265,6 @@
</message>
</context>
</TS>
-Index: mythplugins/mythgame/i18n/mythgame_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_nl.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468)
@@ -11105,10 +12694,6 @@
<source>Favorite:</source>
<translation>Favoriet:</translation>
</message>
-Index: mythplugins/mythgame/i18n/mythgame_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythgame/i18n/mythgame_fi.ts
===================================================================
--- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468)
@@ -11212,6 +12797,150 @@
<text lang="FR">Joueurs</text>
<text lang="ET">Mängijad</text>
<text lang="NB">Spillere</text>
+Index: mythplugins/mythgame/mythgame/rominfo.cpp
+===================================================================
+--- mythplugins/mythgame/mythgame/rominfo.cpp (revision 16468)
++++ mythplugins/mythgame/mythgame/rominfo.cpp (working copy)
+@@ -19,10 +19,9 @@
+
+ void RomInfo::edit_rominfo()
+ {
+-
+ QString rom_ver = Version();
+
+- GameEditDialog romeditdlg(Romname().latin1());
++ GameEditDialog romeditdlg(Romname());
+
+ DialogCode res = romeditdlg.exec();
+
+@@ -32,19 +31,19 @@
+ if (res)
+ {
+ MSqlQuery query(MSqlQuery::InitCon());
+- query.prepare("SELECT gamename,genre,year,country,publisher,favorite "
+- "FROM gamemetadata "
+- "WHERE gametype = :GAMETYPE "
+- "AND romname = :ROMNAME");
++ query.prepare("SELECT gamename,genre,year,country,publisher,favorite "
++ "FROM gamemetadata "
++ "WHERE gametype = :GAMETYPE "
++ "AND romname = :ROMNAME");
+
+- query.bindValue(":GAMETYPE", GameType());
+- query.bindValue(":ROMNAME", Romname());
++ query.bindValue(":GAMETYPE", GameType());
++ query.bindValue(":ROMNAME", Romname());
+
+ if (!query.exec())
+- {
+- MythContext::DBError("RomInfo::edit_rominfo", query);
+- return;
+- }
++ {
++ MythContext::DBError("RomInfo::edit_rominfo", query);
++ return;
++ }
+
+ if (query.isActive() && query.size() > 0);
+ {
+@@ -62,17 +61,17 @@
+ if ((t_gamename != Gamename()) || (t_genre != Genre()) || (t_year != Year())
+ || (t_country != Country()) || (t_publisher != Publisher()) || (t_favourite != Favorite()))
+ {
+- query.prepare("UPDATE gamemetadata SET version = 'CUSTOM' "
+- "WHERE gametype = :GAMETYPE "
+- "AND romname = :ROMNAME");
+- query.bindValue(":GAMETYPE", GameType());
+- query.bindValue(":ROMNAME", Romname());
++ query.prepare("UPDATE gamemetadata SET version = 'CUSTOM' "
++ "WHERE gametype = :GAMETYPE "
++ "AND romname = :ROMNAME");
++ query.bindValue(":GAMETYPE", GameType());
++ query.bindValue(":ROMNAME", Romname());
+
+- if (!query.exec())
+- {
+- MythContext::DBError("RomInfo::edit_rominfo", query);
+- return;
+- }
++ if (!query.exec())
++ {
++ MythContext::DBError("RomInfo::edit_rominfo", query);
++ return;
++ }
+ }
+ }
+ }
+@@ -86,8 +85,8 @@
+ int count = 0;
+
+ query.prepare("SELECT count(*) FROM gamemetadata "
+- "WHERE gametype = :GAMETYPE "
+- "AND romname = :ROMNAME");
++ "WHERE gametype = :GAMETYPE "
++ "AND romname = :ROMNAME");
+
+ query.bindValue(":GAMETYPE", gametype);
+ query.bindValue(":ROMNAME", rom);
+@@ -157,7 +156,7 @@
+ else if (field == "country")
+ country = data;
+ else if (field == "publisher")
+- publisher = data;
++ publisher = data;
+ else if (field == "crc_value")
+ crc_value = data;
+ else if (field == "diskcount")
+@@ -178,7 +177,7 @@
+ MSqlQuery query(MSqlQuery::InitCon());
+
+ query.prepare("UPDATE gamemetadata SET favorite = :FAV "
+- "WHERE romname = :ROMNAME");
++ "WHERE romname = :ROMNAME");
+
+ query.bindValue(":FAV", favorite);
+ query.bindValue(":ROMNAME",romname);
+@@ -219,7 +218,7 @@
+ QString thequery = "SELECT system,gamename,genre,year,romname,favorite,"
+ "rompath,country,crc_value,diskcount,gametype,publisher,"
+ "version FROM gamemetadata WHERE gamename = :GAMENAME "
+- + systemtype + " ORDER BY diskcount DESC";
++ + systemtype + " ORDER BY diskcount DESC";
+
+ query.prepare(thequery);
+ query.bindValue(":SYSTEM", system);
+@@ -245,15 +244,15 @@
+ setVersion(query.value(12).toString());
+ }
+
+- query.prepare("SELECT screenshots FROM gameplayers WHERE playername = :SYSTEM");
++ query.prepare("SELECT screenshots FROM gameplayers "
++ "WHERE playername = :SYSTEM");
+ query.bindValue(":SYSTEM",system);
+-
+ query.exec();
+
+ if (query.isActive() && query.size() > 0);
+ {
+ query.next();
+- if (query.value(0).toString())
++ if (!query.value(0).toString().isEmpty())
+ {
+ QString Image = query.value(0).toString() + "/" + romname;
+ if (FindImage(query.value(0).toString() + "/" + romname, &Image))
+@@ -270,9 +269,9 @@
+ if (RomCount() > 1)
+ {
+ query.prepare("SELECT DISTINCT system FROM gamemetadata "
+- "WHERE romname = :ROMNAME");
+- query.bindValue(":ROMNAME", Romname());
+- query.exec(thequery);
++ "WHERE romname = :ROMNAME");
++ query.bindValue(":ROMNAME", Romname());
++ query.exec();
+
+ if (query.isActive() && query.size() > 0);
+ {
Index: mythplugins/mythzoneminder/mythzmserver/zmserver.h
===================================================================
--- mythplugins/mythzoneminder/mythzmserver/zmserver.h (revision 16468)
@@ -12118,14 +13847,6 @@
</message>
</context>
<context>
-Index: mythplugins/mythnews/i18n/mythnews_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythplugins/mythnews/i18n/mythnews_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythplugins/mythnews/i18n/mythnews_nl.ts
===================================================================
--- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468)
mythtv-0.21-svnfixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythtv-0.21-svnfixes.patch
Index: mythtv-0.21-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.21-svnfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-0.21-svnfixes.patch 3 Aug 2008 15:20:03 -0000 1.1
+++ mythtv-0.21-svnfixes.patch 18 Aug 2008 01:26:30 -0000 1.2
@@ -20607,30 +20607,6 @@
</message>
</context>
<context>
-Index: mythtv/i18n/mythfrontend_nl.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythtv/i18n/mythfrontend_cz.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythtv/i18n/mythfrontend_sv.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythtv/i18n/mythfrontend_he.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythtv/i18n/mythfrontend_fi.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: mythtv/i18n/mythfrontend_dk.qm
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
Index: mythtv/configure
===================================================================
--- mythtv/configure (revision 16468)
@@ -20643,7 +20619,16 @@
echo " --disable-xrandr disable X11 resolution switching"
echo " --disable-xv disable XVideo (X11 video output accel.)"
echo " --disable-xvmc disable XvMC (Linux/BSD MPEG accel.)"
-@@ -904,6 +905,7 @@
+@@ -179,6 +180,8 @@
+ echo ""
+ echo " --enable-mac-bundle produce standalone OS X apps (e.g. mythfrontend.app)"
+ echo ""
++ echo " --runtime-prefix=PREFIX prefix to be used at runtime"
++ echo " (e.g. .. or /myth/latest)"
+ echo " --with-bindings=LIST install the bindings specified in the"
+ echo " comma-separated list"
+ echo " Supported bindings: perl, python"
+@@ -904,6 +907,7 @@
xvmc_vld
dvdv
fribidi
@@ -20651,7 +20636,7 @@
'
MYTHTV_LIST='
-@@ -1178,6 +1180,7 @@
+@@ -1178,6 +1182,7 @@
joystick_menu="default"
lamemp3="yes"
lirc="yes"
@@ -20659,7 +20644,7 @@
opengl="yes"
v4l="yes"
x11="yes"
-@@ -1186,9 +1189,9 @@
+@@ -1186,9 +1191,9 @@
xv="yes"
xvmc="yes"
xvmc_lib=""
@@ -20670,7 +20655,7 @@
# libraries
enable zlib
-@@ -1353,6 +1356,10 @@
+@@ -1353,6 +1358,10 @@
;;
--xvmc-lib=*) xvmc_lib="$optval"
;;
@@ -20681,16 +20666,18 @@
--enable-mac-accel) dvdv="yes"
;;
--disable-mac-accel) dvdv="no"
-@@ -1382,6 +1389,8 @@
+@@ -1382,6 +1391,10 @@
# disabled due to abuse in Gentoo ebuild
--disable-backend)
;;
+ --enable-mac-bundle) enable mac_bundle
+ ;;
++ --runtime-prefix=*) RUNPREFIX="$optval"
++ ;;
--previous|--prev)
echo "No history of previous configure parameters."
;;
-@@ -1599,10 +1608,13 @@
+@@ -1599,10 +1612,13 @@
enable darwin
disable dvb
disable ivtv
@@ -20707,7 +20694,7 @@
disable need_memalign
disable opengl_video
disable opengl_vsync
-@@ -1619,9 +1631,23 @@
+@@ -1619,9 +1635,23 @@
FFSERVERLDFLAGS=-Wl,-bind_at_load
;;
mingw32*)
@@ -20733,7 +20720,7 @@
shlibdir="$bindir"
VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
-@@ -1629,17 +1655,7 @@
+@@ -1629,17 +1659,7 @@
VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
fi
@@ -20751,7 +20738,7 @@
SLIBPREF="lib"
SLIBSUF=".dll"
EXESUF=".exe"
-@@ -2034,6 +2050,8 @@
+@@ -2034,6 +2054,8 @@
# EM64T era Intel Xeon
if expr "$processor" : ".*Intel(R) Xeon(R) CPU.*5110" > /dev/null ; then
ARCHFLAGS="-march=k8" # this would be pentium4 on 32 bit systems
@@ -20760,7 +20747,17 @@
# Various Intel Duo processors (EMT64T capable)
elif expr "$processor" : ".*Intel(R).*Core(TM)2.*CPU" > /dev/null ; then
ARCHFLAGS="-march=k8" # this would be pentium4 on 32 bit systems
-@@ -2702,8 +2720,6 @@
+@@ -2691,6 +2713,9 @@
+ fi
+ fi
+
++enabled libfftw3 && has_library libfftw3_threads && has_header fftw3.h ||
++ disable libfftw3
++
+ enabled x11 && has_library libX11 || disable x11
+ enabled xrandr && has_header X11/extensions/Xrandr.h || disable xrandr
+ enabled xv && has_library libXv || disable xv
+@@ -2702,8 +2727,6 @@
check_header X11/extensions/XvMClib.h
has_library libXvMCW || disable xvmcw
check_header X11/extensions/vldXvMC.h
@@ -20769,7 +20766,7 @@
if test x"$xvmc_lib" != x""; then
VENDOR_XVMC_LIBS="-l"$xvmc_lib
-@@ -2715,25 +2731,34 @@
+@@ -2715,25 +2738,34 @@
VENDOR_XVMC_LIBS="-lviaXvMCPro"
elif has_library libchromeXvMCPro ; then
VENDOR_XVMC_LIBS="-lchromeXvMCPro"
@@ -20807,6 +20804,34 @@
# Can only do Mac accel on Mac platform
+@@ -2838,6 +2870,9 @@
+ libdir="${PREFIX}/${libdir_name}"
+ fi
+
++if test x"$RUNPREFIX" = x""; then
++ RUNPREFIX=${PREFIX}
++fi
+
+ echo "# Basic Settings"
+ echo "Compile type $compile_type"
+@@ -2848,6 +2883,7 @@
+ echo "Compiler cache $ccache$ccache_txt"
+ echo "DistCC $distcc$distcc_txt"
+ echo "install prefix $PREFIX"
++echo "runtime prefix $RUNPREFIX"
+ <<BLOCK_QUOTE
+ echo "source path $source_path"
+ echo "C compiler $cc"
+@@ -3032,7 +3068,9 @@
+ echo "#define FFMPEG_CONFIG_H" >> $TMPH
+ echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
+
++echo "RUNPREFIX=$RUNPREFIX" >> $MYTH_CONFIG_MAK
+ echo "PREFIX=$PREFIX" >> $MYTH_CONFIG_MAK
++echo "LIBDIRNAME=$libdir_name" >> $MYTH_CONFIG_MAK
+ echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK
+ <<BLOCK_QUOTE
+ echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
Index: mythtv/themes/themes.pro
===================================================================
--- mythtv/themes/themes.pro (revision 16468)
@@ -20845,12 +20870,111 @@
<items>8</items>
<image function="selectionbar" filename="rk-selectbar.png" location="-8,3"></image>
<image function="uparrow" filename="gantup.png" location="740,15"></image>
+Index: mythtv/docs/doxygen-architecture-document.cpp
[...5328 lines suppressed...]
@@ -24174,13 +28895,95 @@
Property changes on: mythtv/contrib/Win32/build/mythtvsetup.iss
___________________________________________________________________
-Name: svn:executable
+Added: svn:executable
+ *
+Index: mythtv/contrib/Win32/MythInstaller.bat
+===================================================================
+--- mythtv/contrib/Win32/MythInstaller.bat (revision 0)
++++ mythtv/contrib/Win32/MythInstaller.bat (revision 18161)
+@@ -0,0 +1,69 @@
++@rem = '--*-Perl-*--
++@rem
++@rem Wrapper for bootstrapping Windows build and install.
++@rem Checks for Perl, attempts to download latest win32-packager.pl,
++@rem and then executes that with any supplied arguments.
++@rem
++
++@echo off
++
++if "%OS%" == "Windows_NT" setlocal
++set PERL5LIB=
++set PERLLIB=
++set PERL5OPT=
++set PERLIO=
++set PERL_UNICODE=
++if "%OS%" == "Windows_NT" goto WinNT
++perl -x -S "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
++goto endofperl
++
++:WinNT
++if not exist c:\perl\bin\perl.exe goto no_perl
++@rem
++@rem If we needed any non-standard Perl modules, this is how to install them:
++@rem if NOT exist C:\Perl\site\lib\Config\inifiles.pm call c:\perl\bin\ppm.bat install Config-inifiles
++@rem if errorlevel 1 echo You do not have Perl in your PATH.
++@rem
++perl -x -S %0 %*
++if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endofperl
++if %errorlevel% == 9009 echo You do not have Perl in your PATH.
++if errorlevel 1 goto script_failed_so_exit_with_non_zero_val 2>nul
++goto endofperl
++
++:no_perl
++echo Could not find Perl in C:\Perl.
++echo Please download ActivePerl from http://www.activestate.com/store
++echo install it, and then run this script again.
++sleep 1
++c:\windows\explorer http://www.activestate.com/store/activeperl/download
++goto endofperl
++
++@rem ';
++#!c:/perl/bin/perl.exe -w
++use strict;
++use LWP::UserAgent;
++use IO::File;
++
++my $file = 'win32-packager.pl';
++my $url = "http://svn.mythtv.org/svn/trunk/mythtv/contrib/Win32/build/$file";
++my $proxy = ''; # or somehting like: 'http://enter.your.proxy.here:8080';
++
++my $ua = LWP::UserAgent->new;
++$ua->proxy(['http', 'ftp'], $proxy);
++my $req = HTTP::Request->new(GET => $url);
++my $res = $ua->request($req);
++
++if ($res->is_success) {
++ my $f = new IO::File "> $file" || die "Can't create $file: $!\n";
++ $f->binmode();
++ $f->print($res->content);
++ $f->close();
++}
++
++if ( ! -s $file ) {
++ die "Cannot download $url";
++}
++
++exec "c:/perl/bin/perl.exe -w $file @ARGV";
++__END__
++:endofperl
+
+Property changes on: mythtv/contrib/Win32/MythInstaller.bat
+___________________________________________________________________
+Added: svn:svn:eol-style
+ + native
+Added: svn:keywords
+ + Date Revision Author
+
Index: mythtv/contrib/Win32/run/mythfrontend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 17338)
++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 18161)
@@ -0,0 +1,57 @@
+@Echo off
+::
@@ -24242,7 +29045,7 @@
Index: mythtv/contrib/Win32/run/mythbackend.cmd
===================================================================
--- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0)
-+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 17338)
++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 18161)
@@ -0,0 +1,58 @@
+@Echo off
+::
@@ -24302,11 +29105,82 @@
+Echo.
+Echo The backtrace can be found in .\gdb.txt
+Echo.
+Index: mythtv/contrib/Win32/win32-packager.pl
+===================================================================
+--- mythtv/contrib/Win32/win32-packager.pl (revision 16468)
++++ mythtv/contrib/Win32/win32-packager.pl (working copy)
+@@ -68,11 +68,13 @@
+ # it has NOT been tested much, and will with HIGH PROBABILITY fail somewhere.
+ # TODO - Only $mingw is tested and most likely is safe to change.
+
+-# perl compatible paths (single forward slashes in DOS style):
+-my $msys = 'C:/MSys/1.0/'; # must end in slash, and use forward slashes /
+-my $sources = 'C:/msys/1.0/sources/'; # must end in slash, and use forward slashes /
+-my $mingw = 'C:/MinGW/'; # must end in slash, and use forward slashes /
+-my $mythtv = 'C:/mythtv/'; # this is where the entire SVN checkout lives so c:/mythtv/mythtv/ is the main codebase. # must end in slash, and use forward slashes /
++# Perl compatible paths. DOS style, but forward slashes, and must end in slash:
++my $msys = 'C:/MSys/1.0/';
++my $sources = 'C:/msys/1.0/sources/';
++my $mingw = 'C:/MinGW/';
++my $mythtv = 'C:/mythtv/'; # this is where the entire SVN checkout lives
++ # so c:/mythtv/mythtv/ is the main codebase.
++my $build = 'C:/mythtv/build/'; # where 'make install' installs into
+
+ # DOS executable CMD.exe versions of the paths (for when we shell to DOS mode):
+ my $dosmsys = perl2dos($msys);
+@@ -80,11 +82,17 @@
+ my $dosmingw = perl2dos($mingw);
+ my $dosmythtv = perl2dos($mythtv);
+
+-# unix/msys equivalent versions of the paths (for when we shell to MSYS/UNIX mode):
+-my $unixmsys = '/'; # msys root is always mounted here, irrespective of where DOS says it really is.
+-my $unixmingw = '/mingw/'; # mingw is always mounted here under unix, if you setup mingw right in msys, so we will usually just say /mingw in the code, not '.$unixmingw.' or similar (see /etc/fstab)
+-my $unixsources = perl2unix($sources); $unixsources =~ s#$unixmsys#/#i; #strip leading msys path, if there, it's unnecessary as it's mounted under /
++# Unix/MSys equiv. versions of the paths (for when we shell to MSYS/UNIX mode):
++my $unixmsys = '/'; # MSys root is always mounted here,
++ # irrespective of where DOS says it really is.
++my $unixmingw = '/mingw/'; # MinGW is always mounted here under unix,
++ # if you setup mingw right in msys,
++ # so we will usually just say /mingw in the code,
++ # not '.$unixmingw.' or similar (see /etc/fstab)
++my $unixsources = perl2unix($sources);
++$unixsources =~ s#$unixmsys#/#i; #strip leading msys path, if there, it's unnecessary as it's mounted under /
+ my $unixmythtv = perl2unix($mythtv);
++my $unixbuild = perl2unix($build);
+
+
+ #NOTE: ITS IMPORTANT that the PATHS use the correct SLASH-ing method for the type of action:
+@@ -520,7 +528,16 @@
+ [ grep => ['Makefile|MAKEFILE',$mythtv.'mythtv/Makefile'], shell => ['rm '.$unixmythtv.'mythtv/Makefile','nocheck'], comment => 'broken Makefile, delete it' ],
+
+ # configure
+-[ file => $mythtv.'mythtv/Makefile', shell => ['source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','./configure --prefix=/usr --disable-dbox2 --disable-hdhomerun --disable-dvb --disable-ivtv --disable-iptv --disable-joystick-menu --disable-xvmc-vld --disable-x11 --disable-xvmc --enable-directx --enable-memalign-hack --cpu=k8 --compile-type=debug'], comment => 'do we already have a Makefile for mythtv?' ],
++[ file => $mythtv.'mythtv/Makefile',
++ shell => ['source '.$unixmythtv.'qt_env.sh',
++ 'cd '.$unixmythtv.'mythtv',
++ './configure --prefix='.$unixbuild.' --runtime-prefix=..'.
++ ' --disable-dbox2 --disable-hdhomerun'.
++ ' --disable-dvb --disable-ivtv --disable-iptv'.
++ ' --disable-joystick-menu --disable-xvmc-vld --disable-x11'.
++ ' --disable-xvmc --enable-directx'.
++ ' --enable-memalign-hack --cpu=k8 --compile-type=debug'],
++comment => 'do we already have a Makefile for mythtv?' ],
+ # make
+ [ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
+ [ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ],
Index: mythtv/contrib/OSX/osx-packager.pl
===================================================================
--- mythtv/contrib/OSX/osx-packager.pl (revision 16468)
+++ mythtv/contrib/OSX/osx-packager.pl (working copy)
-@@ -1041,6 +1041,13 @@
+@@ -577,6 +577,7 @@
+ 'mythtv'
+ => [
+ '--prefix=' . $PREFIX,
++ '--runtime-prefix=../Resources',
+ # To "cross compile" something for a lesser Mac:
+ #'--tune=G3',
+ #'--disable-altivec',
+@@ -1041,6 +1042,13 @@
if ( $OPT{'verbose'} )
{ push @bundler, '--verbose' }
@@ -24320,7 +29194,7 @@
### Create each package.
### Note that this is a bit of a waste of disk space,
### because there are now multiple copies of each library.
-@@ -1072,6 +1079,9 @@
+@@ -1072,6 +1080,9 @@
# Remove copy of binary
unlink "$SCRIPTDIR/$target" or die;
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv.spec 3 Aug 2008 15:20:03 -0000 1.1
+++ mythtv.spec 18 Aug 2008 01:26:30 -0000 1.2
@@ -1,5 +1,5 @@
# svn revision number
-%define _svnver r17859
+%define _svnver r18161
%define branch release-0-21-fixes
# Nb: base 0.21 svn rev is r16468
#define branch trunk
@@ -22,7 +22,7 @@
%if "%{branch}" == "trunk"
Release: 0.2.%{_svnver}%{?dist}
%else
-Release: 7%{?dist}
+Release: 8%{?dist}
%endif
URL: http://www.mythtv.org/
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -114,7 +114,7 @@
BuildRequires: mjpegtools-devel >= 1.6.1, xvidcore-devel >= 0.9.1
BuildRequires: libfame-devel >= 0.9.0
BuildRequires: transcode >= 0.6.8
-BuildRequires: libdvdcss-devel >= 1.2.7
+#BuildRequires: libdvdcss-devel >= 1.2.7
# mythbrowser
BuildRequires: kdelibs3-devel
# mythphone
@@ -1003,6 +1003,11 @@
%endif
%changelog
+* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8
+- Don't BR: libdvdcss-devel
+- Update release-0-21-fixes patches (r18161)
+- Rebuild for libraw1394 v2.0.0
+
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7
- rebuild
16 years, 3 months
rpms/libfame/devel libfame-0.9.1-fstrict-aliasing.patch, NONE, 1.1 libfame-0.9.1-gcc34-1.patch, NONE, 1.1 libfame-0.9.1-underquoted.patch, NONE, 1.1 libfame-0.9.1-x86_64.patch, NONE, 1.1 libfame-aclocal18.patch, NONE, 1.1 libfame-config-rpath.patch, NONE, 1.1 libfame-gccver.patch, NONE, 1.1 libfame-nomarch.patch, NONE, 1.1 libfame.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/libfame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19857
Modified Files:
.cvsignore sources
Added Files:
libfame-0.9.1-fstrict-aliasing.patch
libfame-0.9.1-gcc34-1.patch libfame-0.9.1-underquoted.patch
libfame-0.9.1-x86_64.patch libfame-aclocal18.patch
libfame-config-rpath.patch libfame-gccver.patch
libfame-nomarch.patch libfame.spec
Log Message:
* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.9.1-13
- Merge livna and freshrpms packages for rpmfusion
libfame-0.9.1-fstrict-aliasing.patch:
--- NEW FILE libfame-0.9.1-fstrict-aliasing.patch ---
--- libfame-0.9.1.orig/configure.in 2008-08-15 23:50:51.000000000 -0400
+++ libfame-0.9.1/configure.in 2008-08-15 23:55:14.000000000 -0400
@@ -90,26 +90,9 @@ dnl See if we need to pass -lm for the m
AC_CHECK_LIB(m, sqrt, LIBS="$LIBS -lm")
dnl Optimize
+dnl enable -fstrict-aliasing unconditionally
if test x$ac_cv_prog_gcc = xyes; then
- CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math"
-
-dnl -fstrict-aliasing doesn't seem to be supported by gcc < 2.95
- gcc_major_version=`$CC -dumpversion | \
- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gcc_minor_version=`$CC -dumpversion | \
- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gcc_micro_version=`$CC -dumpversion | \
- sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- dnl ok, I must admit I don't know how to do or/and ;)
- if test $gcc_major_version -eq 2; then
- if test $gcc_minor_version -gt 94; then
- CFLAGS="$CFLAGS -fstrict-aliasing"
- fi
- fi
- if test $gcc_major_version -gt 2; then
- CFLAGS="$CFLAGS -fstrict-aliasing"
- fi
+ CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math -fstrict-aliasing"
fi
dnl Check for debugging support
libfame-0.9.1-gcc34-1.patch:
--- NEW FILE libfame-0.9.1-gcc34-1.patch ---
Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
Date: 2004-09-04
Initial Package Version: 0.9.1
Upstream Status: Not submitted
Origin: Randy McMurchy
Description: Fixes libfame library when compiled with GCC-3.4.x
$LastChangedBy: randy $
$Date: 2004-09-05 00:11:51 -0600 (Sun, 05 Sep 2004) $
diff -Naur libfame-0.9.1-orig/src/half_mmx.h libfame-0.9.1/src/half_mmx.h
--- libfame-0.9.1-orig/src/half_mmx.h 2002-04-30 18:04:02.000000000 +0000
+++ libfame-0.9.1/src/half_mmx.h 2004-09-05 03:49:09.666845896 +0000
@@ -18,7 +18,7 @@
*/
/**************************** half-pixel interpolation ***********************/
-static short const _mmx_one[] = { 1, 1, 1, 1 };
+const _mmx_one[] = { 1, 1, 1, 1 };
static void inline mmx_interpolate(unsigned char **ref,
int pitch,
diff -Naur libfame-0.9.1-orig/src/half_sse.h libfame-0.9.1/src/half_sse.h
--- libfame-0.9.1-orig/src/half_sse.h 2002-01-27 02:24:56.000000000 +0000
+++ libfame-0.9.1/src/half_sse.h 2004-09-05 03:49:39.894250632 +0000
@@ -19,7 +19,7 @@
*/
/**************************** half-pixel interpolation ***********************/
-static short const _mmx_one[] = { 1, 1, 1, 1 };
+const _mmx_one[] = { 1, 1, 1, 1 };
static unsigned char const _mmx_one_byte[] = {1,1,1,1,1,1,1,1};
libfame-0.9.1-underquoted.patch:
--- NEW FILE libfame-0.9.1-underquoted.patch ---
diff -Naupr libfame-0.9.1.orig/libfame.m4.in libfame-0.9.1/libfame.m4.in
--- libfame-0.9.1.orig/libfame.m4.in 2001-11-20 12:56:37.000000000 +0100
+++ libfame-0.9.1/libfame.m4.in 2006-09-18 20:38:20.000000000 +0200
@@ -3,7 +3,7 @@ dnl Test for libfame, and define LIBFAME
dnl Vivien Chappelier 12/11/00
dnl stolen from ORBit autoconf
dnl
-AC_DEFUN(AM_PATH_LIBFAME,
+AC_DEFUN([AM_PATH_LIBFAME],
[dnl
dnl Get the cflags and libraries from the libfame-config script
dnl
libfame-0.9.1-x86_64.patch:
--- NEW FILE libfame-0.9.1-x86_64.patch ---
diff -Naupr libfame-0.9.1.orig/src/fame_malloc.c libfame-0.9.1/src/fame_malloc.c
--- libfame-0.9.1.orig/src/fame_malloc.c 2003-06-20 14:40:30.000000000 +0200
+++ libfame-0.9.1/src/fame_malloc.c 2005-09-30 11:08:48.000000000 +0200
@@ -36,9 +36,9 @@ void* fame_malloc(size_t size)
*/
ptr = (unsigned char*) malloc(size+ALIGN);
- aligned = (unsigned char*) (((unsigned int)ptr & (~(ALIGN-1))) + ALIGN );
+ aligned = (unsigned char*) (((unsigned long)ptr &(~(ALIGN-1))) + ALIGN );
padding = aligned - 1;
- *padding = (ALIGN-1) - ((unsigned int)ptr & (ALIGN-1));
+ *padding = (ALIGN-1) - ((unsigned long)ptr & (ALIGN-1));
return ((void*)aligned);
}
libfame-aclocal18.patch:
--- NEW FILE libfame-aclocal18.patch ---
--- libfame.m4.in~ 2001-11-20 13:56:37.000000000 +0200
+++ libfame.m4.in 2004-07-17 22:44:13.241838905 +0300
@@ -3,7 +3,7 @@
dnl Vivien Chappelier 12/11/00
dnl stolen from ORBit autoconf
dnl
-AC_DEFUN(AM_PATH_LIBFAME,
+AC_DEFUN([AM_PATH_LIBFAME],
[dnl
dnl Get the cflags and libraries from the libfame-config script
dnl
libfame-config-rpath.patch:
--- NEW FILE libfame-config-rpath.patch ---
--- libfame-config.in~ 2001-06-22 14:10:59.000000000 +0300
+++ libfame-config.in 2004-07-17 22:47:55.867418653 +0300
@@ -48,7 +48,7 @@
if [ "`uname`" = "SunOS" ]; then
libdirs="-L@libdir@ -R@libdir@"
else
- libdirs="-L@libdir@ @FAME_RLD_FLAGS@"
+ libdirs="-L@libdir@"
fi
echo $libdirs -lfame
;;
libfame-gccver.patch:
--- NEW FILE libfame-gccver.patch ---
diff -Naru libfame-0.9.1.orig/configure.in libfame-0.9.1/configure.in
--- libfame-0.9.1.orig/configure.in 2004-02-11 15:12:24.000000000 +0200
+++ libfame-0.9.1/configure.in 2004-07-17 23:26:07.421758515 +0300
@@ -101,11 +101,11 @@
CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math"
dnl -fstrict-aliasing doesn't seem to be supported by gcc < 2.95
- gcc_major_version=`$CC --version | \
+ gcc_major_version=`$CC -dumpversion | \
sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gcc_minor_version=`$CC --version | \
+ gcc_minor_version=`$CC -dumpversion | \
sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gcc_micro_version=`$CC --version | \
+ gcc_micro_version=`$CC -dumpversion | \
sed -e 's,[[^0-9.]],,g' -e 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
dnl ok, I must admit I don't know how to do or/and ;)
diff -Naru libfame-0.9.1.orig/configure libfame-0.9.1/configure
--- libfame-0.9.1.orig/configure 2004-02-11 15:12:28.000000000 +0200
+++ libfame-0.9.1/configure 2004-07-17 23:26:07.422758205 +0300
@@ -4607,11 +4607,11 @@
if test x$ac_cv_c_compiler_gnu = xyes; then
CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops -ffast-math"
- gcc_major_version=`$CC --version | \
+ gcc_major_version=`$CC -dumpversion | \
sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
- gcc_minor_version=`$CC --version | \
+ gcc_minor_version=`$CC -dumpversion | \
sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
- gcc_micro_version=`$CC --version | \
+ gcc_micro_version=`$CC -dumpversion | \
sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
if test $gcc_major_version -eq 2; then
libfame-nomarch.patch:
--- NEW FILE libfame-nomarch.patch ---
diff -Naru libfame-0.9.1.orig/configure libfame-0.9.1/configure
--- libfame-0.9.1.orig/configure 2004-02-11 15:12:28.000000000 +0200
+++ libfame-0.9.1/configure 2004-07-18 00:01:13.266432497 +0300
@@ -4505,18 +4505,11 @@
fi
;;
i386-*-*)
- if test x$ac_cv_c_compiler_gnu = xyes; then
- CFLAGS="$CFLAGS -march=i386"
- fi
- ;;
- i486-*-*)
- if test x$ac_cv_c_compiler_gnu = xyes; then
- CFLAGS="$CFLAGS -march=i486 -DHAS_BSWAP"
- fi
+ true
;;
i?86-*-*)
if test x$ac_cv_c_compiler_gnu = xyes; then
- CFLAGS="$CFLAGS -march=i586 -DHAS_BSWAP"
+ CFLAGS="$CFLAGS -DHAS_BSWAP"
fi
;;
esac
diff -Naru libfame-0.9.1.orig/configure.in libfame-0.9.1/configure.in
--- libfame-0.9.1.orig/configure.in 2004-02-11 15:12:24.000000000 +0200
+++ libfame-0.9.1/configure.in 2004-07-18 00:01:01.288132690 +0300
@@ -61,18 +61,11 @@
fi
;;
i386-*-*)
- if test x$ac_cv_prog_gcc = xyes; then
- CFLAGS="$CFLAGS -march=i386"
- fi
- ;;
- i486-*-*)
- if test x$ac_cv_prog_gcc = xyes; then
- CFLAGS="$CFLAGS -march=i486 -DHAS_BSWAP"
- fi
+ true
;;
i?86-*-*)
if test x$ac_cv_prog_gcc = xyes; then
- CFLAGS="$CFLAGS -march=i586 -DHAS_BSWAP"
+ CFLAGS="$CFLAGS -DHAS_BSWAP"
fi
;;
esac
--- NEW FILE libfame.spec ---
Summary: Fast Assembly MPEG Encoding library
Name: libfame
Version: 0.9.1
Release: 13%{?dist}
License: LGPL
Group: System Environment/Libraries
Source0: http://download.sourceforge.net/fame/%{name}-%{version}.tar.gz
Patch0: %{name}-aclocal18.patch
Patch1: %{name}-config-rpath.patch
Patch2: %{name}-gccver.patch
Patch3: %{name}-nomarch.patch
Patch4: http://www.linuxfromscratch.org/blfs/downloads/svn/libfame-0.9.1-gcc34-1....
Patch5: libfame-0.9.1-fstrict-aliasing.patch
Patch6: libfame-0.9.1-x86_64.patch
URL: http://fame.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: autoconf, automake, libtool
%description
FAME is a library for fast MPEG encoding.
%package devel
Summary: Libraries and include to develop using FAME
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
FAME is a library for fast MPEG encoding.
This package contains the libraries, include files and other resources
you can use to develop FAME applications.
%prep
%setup -q
%patch0 -p0 -b .aclocal18
%patch1 -p0 -b .config-rpath
%patch2 -p1 -b .gccver
%patch3 -p1 -b .nomarch
%patch4 -p1 -b .mmxone
%patch5 -p1 -b .fstrict-aliasing
%patch6 -p1 -b .x86_64
# This is required since the included libtool stuff is too old and breaks
# linking (-lm and -lc functions not found!) on FC5 x86_64.
%{__rm} -f acinclude.m4 aclocal.m4
%{__cp} -f /usr/share/aclocal/libtool.m4 libtool.m4
touch NEWS ChangeLog
autoreconf --force --install
# Fix lib stuff for lib64
%{__perl} -pi.orig -e 's|/lib"|/%{_lib}"|g' configure.in
%build
# Note: SSE support does nothing (as of 0.9.1). grep for HAS_SSE.
%configure --disable-dependency-tracking \
%ifarch %{ix86} ia64
--enable-mmx
%else
--disable-mmx
%endif
make %{?_smp_flags}
%install
rm -Rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -Rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS CHANGES COPYING README TODO
%{_libdir}/libfame*.so.*
%files devel
%defattr(-,root,root,-)
%exclude %{_libdir}/libfame.la
%{_bindir}/libfame-config
%{_includedir}/fame*.h
%{_libdir}/libfame.a
%{_libdir}/libfame.so
%{_datadir}/aclocal/libfame.m4
%{_mandir}/man3/fame*.3*
%changelog
* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.9.1-13
- Merge livna and freshrpms packages for rpmfusion
* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-12
- Update underquoted patch, which stopped applying cleanly for some reason.
* Mon Mar 20 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-11
- Remove old libtool/m4 files to fix x86_64 FC5 linking.
* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 0.9.1-9
- Release bump to drop the disttag number in FC5 build.
* Fri Sep 30 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-8
- Include x86_64 patch from Andy Loening, fixes some segfaults.
- Update underquoted patch to also remove warnings at libfame build time.
* Sun Jun 5 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-7
- Make the underquoted patch apply to the .in file too, so it actually works.
- Put ldconfig calls back as programs to have rpm's deps pick them up.
* Thu May 5 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-6
- Run plain "./autogen.sh" instead of autoreconf to avoid libm problem on
x86_64 (weird one!).
- Actually really apply the last patch too...
* Sun May 1 2005 Matthias Saou <http://freshrpms.net/> 0.9.1-5
- Patch the m4 file to fix underquoted warning.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libfame/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Aug 2008 15:45:18 -0000 1.1
+++ .cvsignore 18 Aug 2008 01:14:39 -0000 1.2
@@ -0,0 +1 @@
+libfame-0.9.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libfame/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Aug 2008 15:45:18 -0000 1.1
+++ sources 18 Aug 2008 01:14:39 -0000 1.2
@@ -0,0 +1 @@
+880085761e17a3b4fc41f4f6f198fd3b libfame-0.9.1.tar.gz
16 years, 3 months
rpms/live555/devel live555.spec,1.1,1.2
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/live555/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6577
Modified Files:
live555.spec
Log Message:
- real fix for the find issue
Index: live555.spec
===================================================================
RCS file: /cvs/free/rpms/live555/devel/live555.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- live555.spec 17 Aug 2008 21:54:41 -0000 1.1
+++ live555.spec 17 Aug 2008 22:07:54 -0000 1.2
@@ -16,7 +16,6 @@
Patch1: live.2008.02.08-shared.patch
Patch2: live.2008.04.03-reorder.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: findutils
%description
This code forms a set of C++ libraries for multimedia streaming,
@@ -144,9 +143,35 @@
ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so
done
-for i in mediaServer/live555MediaServer `find testProgs -type f -perm 755` ; do
+install -pm755 mediaServer/live555MediaServer $RPM_BUILD_ROOT%{_bindir}
+
+pushd testProgs
+for i in \
+ MPEG2TransportStreamIndexer \
+ openRTSP \
+ playSIP \
+ sapWatch \
+ testAMRAudioStreamer \
+ testMP3Receiver \
+ testMP3Streamer \
+ testMPEG1or2AudioVideoStreamer \
+ testMPEG1or2AudioVideoToDarwin \
+ testMPEG1or2ProgramToTransportStream \
+ testMPEG1or2Splitter \
+ testMPEG1or2VideoReceiver \
+ testMPEG1or2VideoStreamer \
+ testMPEG2TransportStreamTrickPlay \
+ testMPEG2TransportStreamer \
+ testMPEG4VideoStreamer \
+ testMPEG4VideoToDarwin \
+ testOnDemandRTSPServer \
+ testRelay \
+ testWAVAudioStreamer \
+ vobStreamer \
+; do
install -pm755 $i $RPM_BUILD_ROOT%{_bindir}
done
+popd
%clean
rm -rf $RPM_BUILD_ROOT
@@ -192,7 +217,7 @@
- specfile whitespace cosmetics
- made tools depend on specific version until we have a stable ABI
- added proper obsoletes/provides to devel
-- added findutils BR (missing find caused -tools to lack most of the binaries)
+- made -tools binaries installation independent of umask
* Mon May 5 2008 kwizart < kwizart at gmail.com > - 0-0.19.2008.04.03
- Rename package from live to live555
16 years, 3 months
rpms/live555/devel liblivemedia_2007.02.20-2.diff.gz, NONE, 1.1 live.2008.02.08-shared.patch, NONE, 1.1 live.2008.04.03-reorder.patch, NONE, 1.1 live555.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/live555/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5291
Modified Files:
.cvsignore sources
Added Files:
liblivemedia_2007.02.20-2.diff.gz live.2008.02.08-shared.patch
live.2008.04.03-reorder.patch live555.spec
Log Message:
- initial import from livna-devel including Nicolas' changes
--- NEW FILE liblivemedia_2007.02.20-2.diff.gz ---
16 years, 3 months