OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Aug-2003 18:19:31
Branch: HEAD Handle: 2003081317193000
Added files:
openpkg-src/mplayer live.patch
Modified files:
openpkg-src/mplayer mplayer.spec
Log:
Add live streaming libs for rtp and rtsp, and adjust codecs
configuration and font path name
Summary:
Revision Changes Path
1.1 +30 -0 openpkg-src/mplayer/live.patch
1.18 +27 -4 openpkg-src/mplayer/mplayer.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mplayer/live.patch
============================================================================
$ cvs diff -u -r0 -r1.1 live.patch
--- /dev/null 2003-08-13 18:19:31.000000000 +0200
+++ live.patch 2003-08-13 18:19:31.000000000 +0200
@@ -0,0 +1,30 @@
+diff -Naur live.orig/groupsock/Groupsock.cpp live/groupsock/Groupsock.cpp
+--- live.orig/groupsock/Groupsock.cpp Thu Aug 7 09:52:09 2003
++++ live/groupsock/Groupsock.cpp Wed Aug 13 14:59:36 2003
+@@ -24,9 +24,9 @@
+ #include "TunnelEncaps.hh"
+
+ #if defined(__WIN32__) || defined(_WIN32)
+-#include <strstrea.h>
++#include <strstrea>
+ #else
+-#include <strstream.h>
++#include <strstream>
+ #endif
+ #include <stdio.h>
+
+diff -Naur live.orig/groupsock/NetInterface.cpp live/groupsock/NetInterface.cpp
+--- live.orig/groupsock/NetInterface.cpp Thu Aug 7 09:52:09 2003
++++ live/groupsock/NetInterface.cpp Wed Aug 13 15:00:00 2003
+@@ -22,9 +22,9 @@
+ #include "GroupsockHelper.hh"
+
+ #if defined(__WIN32__) || defined(_WIN32)
+-#include <strstrea.h>
++#include <strstrea>
+ #else
+-#include <strstream.h>
++#include <strstream>
+ #endif
+
+ ////////// NetInterface //////////
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mplayer/mplayer.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 mplayer.spec
--- openpkg-src/mplayer/mplayer.spec 13 Aug 2003 11:35:30 -0000 1.17
+++ openpkg-src/mplayer/mplayer.spec 13 Aug 2003 16:19:30 -0000 1.18
@@ -26,6 +26,7 @@
# package versions
%define V_mplayer 0.91
%define V_blue 1.0
+%define V_live 2003.08.07
# package information
Name: mplayer
@@ -49,7 +50,9 @@
Source2: ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/win32codecs.tar.bz2
Source3: ftp://ftp.mplayerhq.hu/MPlayer/releases/codecs/qt5dlls.tar.bz2
Source4: ftp://ftp.mplayerhq.hu/MPlayer/Skin/Blue-%{V_blue}.tar.bz2
+Source5: http://www.live.com/liveMedia/public/live.%{V_live}.tar.gz
Patch0: mplayer.patch
+Patch1: live.patch
# build information
Prefix: %{l_prefix}
@@ -73,10 +76,25 @@
status display (OSD), which is also used for displaying subtitles.
%prep
- %setup -q -n MPlayer-%{V_mplayer}
- %patch -p0
+ %setup0 -q -n MPlayer-%{V_mplayer}
+ %setup1 -q -n MPlayer-%{V_mplayer} -T -D -a 5
+ %patch0 -p0
+ %patch1 -p0
%build
+ # translate target names into qmake system types
+ case "%{l_target}" in *-solaris*) host=solaris ;;
+ *-linux*) host=linux ;;
+ *-freebsd*) host=freebsd ;;
+ *) host=`uname | tr A-Z a-z`-g++ ;;
+ esac
+
+ # build live streaming libs first
+ ( cd live
+ ./genMakefiles $host
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
+
# configure programs
CC="%{l_cc}" \
CXX="%{l_cxx}" \
@@ -87,6 +105,7 @@
./configure \
--prefix=%{l_prefix} \
--confdir=%{l_prefix}/etc/mplayer/ \
+ --with-codecsdir=%{l_prefix}/libexec/mplayer/nativecodecs/ \
%if "%{with_gui}" == "yes"
--enable-gui \
--with-glib-config=%{l_prefix}/bin/glib-config \
@@ -103,6 +122,8 @@
%endif
--enable-largefiles \
--enable-streaming \
+ --enable-live \
+ --with-livelibdir=`pwd`/live \
--enable-xvid \
--enable-freetype \
--enable-vorbis \
@@ -146,7 +167,8 @@
%if "%{with_gui}" == "yes"
$RPM_BUILD_ROOT%{l_prefix}/share/mplayer/Skin \
%endif
- $RPM_BUILD_ROOT%{l_prefix}/share/mplayer/font
+ $RPM_BUILD_ROOT%{l_prefix}/share/mplayer/font \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/mplayer/nativecodecs
# install binaries
%{l_shtool} install -s -c -m 755 \
@@ -186,7 +208,8 @@
# install fonts for OSD and subtitles
%{l_bzip2} -dc %{SOURCE font-arial-iso-8859-1.tar.bz2} | %{l_tar} -xvf -
- cp -f font-arial-24-iso-8859-1/* $RPM_BUILD_ROOT%{l_prefix}/share/mplayer/font/
+ cp -f font-arial-iso-8859-1/font-arial-24-iso-8859-1/* \
+ $RPM_BUILD_ROOT%{l_prefix}/share/mplayer/font/
%if "%{with_win32}" == "yes"
# install win32 and quicktime codecs
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
