Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=45b4db0c903558bbfdee8cf4a2a2dd9b871647fe
commit 45b4db0c903558bbfdee8cf4a2a2dd9b871647fe
Author: crazy <[EMAIL PROTECTED]>
Date: Thu Sep 20 23:31:23 2007 +0200
mpeg4ip-1.6-1-i686
* Version bump
* reworked the whole FB
* added 4 new patches
* utils have now an own subpackage
* added x86_64 to subarch as well , I hope does compile
diff --git a/source/multimedia/mpeg4ip/FrugalBuild
b/source/multimedia/mpeg4ip/FrugalBuild
index 807be2f..2845961 100644
--- a/source/multimedia/mpeg4ip/FrugalBuild
+++ b/source/multimedia/mpeg4ip/FrugalBuild
@@ -2,42 +2,58 @@
# Maintainer: crazy <[EMAIL PROTECTED]>
pkgname=mpeg4ip
-pkgver=1.5.0.1
-pkgrel=2
+pkgver=1.6
+pkgrel=1
pkgdesc="mpeg4ip provides an end-to-end system to explore streaming multimedia"
Finclude sourceforge
depends=("libmp4v2=$pkgver")
makedepends=('id3lib' 'sdl' 'gtk+2' 'faad2' 'mpeg2dec' 'x264>=20070421' \
- 'freetype2' 'libice' 'ffmpeg>=20070422' 'nas' 'alsa-lib' 'srtp')
+ 'freetype2' 'libice' 'ffmpeg>=20070422' 'nas' \
+ 'alsa-lib' 'srtp' 'twolame')
groups=('multimedia')
options=('scriptlet')
archs=('i686' 'x86_64')
-source=($source mpeg4ip-fixes.patch ffmpeg.patch)
-sha1sums=('1271de695ed65284d9c39aa91bf26c5494603fd3'\
- '2dbb820a6c8032861484686060861be05fc5f201'\
- 'de3a2ef12a3b2d57c08a8ad25c3a21310c6ed2d5')
+source=($source autoreconf.patch \
+ type_basic.cpp_compile.patch alsa.patch \
+ build-with-werror-is-a-configure-option.patch)
+sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \
+ '40b3370027cace5e3cfecfbf15798bf0ade5f036' \
+ '9657405dfe23cd8baeb4ea419cd5f036b03fa8c8' \
+ 'ec4cf44483d9e92afb97e7eb0866da5813577464' \
+ 'a2f18f62986a7f19acce4c788e8ce30d3c3e0691')
-subpkgs=("$pkgname-player" "$pkgname-server")
-subdescs=('mpeg4ip player' 'mpeg4ip server')
-## kind I need rework this
-subdepends=("$pkgname=$pkgver gtk+2 sdl ffmpeg>=20070422 mpeg2dec id3lib
alsa-lib faad2 libmad" "$pkgname=$pkgver $pkgname-player=$pkgver")
-subgroups=('xmultimedia' 'xmultimedia')
-subarchs=('i686' 'i686')
+subpkgs=("$pkgname-player" "$pkgname-server" "$pkgname-utils")
+subdescs=('mpeg4ip player' 'mpeg4ip server' 'mpeg4ip utils')
+subdepends=("$pkgname=$pkgver gtk+2 sdl ffmpeg>=20070422 mpeg2dec id3lib
alsa-lib faad2 libmad" \
+ "$pkgname=$pkgver $pkgname-player=$pkgver twolame"
"$pkgname=$pkgver sdl")
+subgroups=('xmultimedia' 'xmultimedia' 'xmultimedia')
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
build()
{
Fcd
+ ## hack to allow autoreconf
+ touch bootstrapped || Fdie
+ touch lib/SDLAudio/{NEWS,AUTHORS,ChangeLog} || Fdie
+ touch common/video/iso-mpeg4/{NEWS,AUTHORS,ChangeLog} || Fdie
+ libtoolize --copy --force || Fdie
Fpatchall
- autoconf || Fdie
+ Fautoreconf
export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
- [ "$CARCH" == "x86_64" ] && CXXFLAGS="$CXXFLAGS -fPIC"
- ./bootstrap \
- $Fconfopts \
+ export CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ if [ "$CARCH" == "x86_64" ]; then
+ CXXFLAGS="$CXXFLAGS -fPIC"
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+
+ Fconf \
--enable-ipv6 \
--disable-dependency-tracking \
- --enable-warns-as-err=no \
+ --disable-warns-as-err \
--enable-mp4live=yes \
- --enable-mp4live-alsa=no \
+ --enable-alsa=yes \
+ --enable-shared-alsa=yes \
+ --enable-mp4live-alsa \
--enable-server=yes \
--enable-player=yes \
--enable-srtp \
@@ -51,37 +67,26 @@ build()
--enable-mad=yes \
--enable-mpeg2dec=yes \
--with-x
- ## :FIXME: --enable-mp4live-alsa is broken :|
- ## kill Werror shit and fix the Makefile's
- Fsed '-Werror' '' common/video/iso-mpeg4/src/Makefile
+
make || Fdie
Fmakeinstall
+
## this is already in libmp4v2 package
Frm usr/lib/libmp4v2.*
Frm usr/include/{mp4.h,mpeg4ip.h,mpeg4ip_config.h,mpeg4ip_version.h}
- ## player
- for incsplit in codec_plugin.h h264_sdp.h mpeg4_audio_config.h
mpeg4_sdp.h rtp_plugin.h text_plugin.h
- do
- Fsplit $pkgname-player usr/include/$incsplit
- done
- for binsplit in gmp4player mp4player sdl_pcm_play yuvdump
- do
- Fsplit $pkgname-player usr/bin/$binsplit
- done
- Fsplit $pkgname-player usr/lib/libh264util.*
- Fsplit $pkgname-player usr/lib/libhttp.*
- Fsplit $pkgname-player usr/lib/libmp4util.*
- Fsplit $pkgname-player usr/lib/libmpeg4ipSDL*
- Fsplit $pkgname-player usr/lib/libmpeg4ip_celp.*
- Fsplit $pkgname-player usr/lib/libmpeg4ip_celpbs.*
- Fsplit $pkgname-player usr/lib/libmpeg4ip_faad.*
- Fsplit $pkgname-player usr/lib/libmpeg4ip_mpeg4_iso.*
+
+ ## Player
Fsplit $pkgname-player usr/lib/mp4player_plugin
- ## server
- for i in avi2raw avidump lboxcrop mp4creator mp4live rgb2yuv
- do
- Fsplit $pkgname-server usr/bin/$i
- done
+ Fsplit $pkgname-player usr/lib/libmpeg4ip_{celp,celpbs,faad}.*
+ Fsplit $pkgname-player usr/lib/{libmp4util,libhttp}.*
+ Fsplit $pkgname-player
usr/include/{h264_sdp,mpeg4_audio_config,codec_plugin,mpeg4_sdp,rtp_plugin,text_plugin}.h
+ Fsplit $pkgname-player usr/bin/{mp4player,gmp4player}
+
+ ## Server
+ Fsplit $pkgname-server
usr/bin/{avi2raw,avidump,lboxcrop,mp4creator,mp4live,rgb2yuv}
+
+ ## Utils
+ Fsplit $pkgname-utils
usr/bin/{h264_parse,mpeg2video_parse,mpeg4vol,sdl_pcm_play,yuvdump,mpeg2t_dump}
}
# optimization OK
diff --git a/source/multimedia/mpeg4ip/alsa.patch
b/source/multimedia/mpeg4ip/alsa.patch
new file mode 100644
index 0000000..8cb7e2b
--- /dev/null
+++ b/source/multimedia/mpeg4ip/alsa.patch
@@ -0,0 +1,26 @@
+diff -Naurp mpeg4ip-1.6/configure.in mpeg4ip-1.6-p/configure.in
+--- mpeg4ip-1.6/configure.in 2007-09-18 22:43:13.000000000 +0200
++++ mpeg4ip-1.6-p/configure.in 2007-09-20 18:25:59.000000000 +0200
+@@ -415,8 +415,8 @@ if test x$enable_mp4live = xyes; then
+ AM_PATH_ALSA(0.9.0, [have_alsa=yes], [have_alsa=no])
+ if test x$have_alsa = xyes; then
+ AC_CHECK_FUNCS(snd_pcm_hw_params_set_rate_resample)
+- dnl - not needed AC_SUBST(ALSA_CFLAGS) - gotten by SDL_CFLAGS
+- dnl - not needed AC_SUBST(ALSA_LIBS) - gotten by SDL_LIBS
++ AC_SUBST(ALSA_CFLAGS)
++ AC_SUBST(ALSA_LIBS)
+ AC_DEFINE(HAVE_ALSA, [1], [have alsa enabled for mp4live])
+ fi
+ CFLAGS="$alsa_save_CFLAGS"
+diff -Naurp mpeg4ip-1.6/server/mp4live/Makefile.am
mpeg4ip-1.6-p/server/mp4live/Makefile.am
+--- mpeg4ip-1.6/server/mp4live/Makefile.am 2007-01-26 20:50:00.000000000
+0100
++++ mpeg4ip-1.6-p/server/mp4live/Makefile.am 2007-09-20 18:27:05.000000000
+0200
+@@ -176,7 +176,7 @@ mp4live_LDADD = \
+ $(top_builddir)/lib/ffmpeg/libmpeg4ip_ffmpeg.la \
+ @SRTPLIB@ \
+ -lpthread \
+- @SDL_LIBS@ $(GUILIBS) @FFMPEG_LIB@ @LIBVORBIS_LIB@ $(XVID_LIB) \
++ @SDL_LIBS@ @ALSA_LIBS@ $(GUILIBS) @FFMPEG_LIB@ @LIBVORBIS_LIB@
$(XVID_LIB) \
+ @X264_LIB@
+
+ EXTRA_DIST = $(ed2) video_v4l_source.cpp
diff --git a/source/multimedia/mpeg4ip/autoreconf.patch
b/source/multimedia/mpeg4ip/autoreconf.patch
new file mode 100644
index 0000000..9c3e8d4
--- /dev/null
+++ b/source/multimedia/mpeg4ip/autoreconf.patch
@@ -0,0 +1,11 @@
+diff -Nuapr mpeg4ip-1.6/lib/SDLAudio/configure.in
mpeg4ip-1.6-p/lib/SDLAudio/configure.in
+--- mpeg4ip-1.6/lib/SDLAudio/configure.in 2005-01-13 19:21:29.000000000
+0100
++++ mpeg4ip-1.6-p/lib/SDLAudio/configure.in 2007-09-20 14:57:51.000000000
+0200
+@@ -47,6 +47,7 @@ dnl Check for tools
+
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
++AM_PROG_AS
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_C_INLINE
diff --git
a/source/multimedia/mpeg4ip/build-with-werror-is-a-configure-option.patch
b/source/multimedia/mpeg4ip/build-with-werror-is-a-configure-option.patch
new file mode 100644
index 0000000..3cf131d
--- /dev/null
+++ b/source/multimedia/mpeg4ip/build-with-werror-is-a-configure-option.patch
@@ -0,0 +1,10 @@
+diff -Naur mpeg4ip-1.6/common/video/iso-mpeg4/src/Makefile.am
mpeg4ip-1.6-p/common/video/iso-mpeg4/src/Makefile.am
+--- mpeg4ip-1.6/common/video/iso-mpeg4/src/Makefile.am 2006-01-03
23:24:07.000000000 +0100
++++ mpeg4ip-1.6-p/common/video/iso-mpeg4/src/Makefile.am 2007-09-20
21:01:47.000000000 +0200
+@@ -1,5 +1,5 @@
+
+-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT
-DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@
++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT
-DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@
+
+ INCLUDES = -I$(srcdir)/../include
+
diff --git a/source/multimedia/mpeg4ip/ffmpeg.patch
b/source/multimedia/mpeg4ip/ffmpeg.patch
deleted file mode 100644
index 97678d3..0000000
--- a/source/multimedia/mpeg4ip/ffmpeg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- player/plugin/audio/ffmpeg/ffmpeg.cpp.orig 2006-11-18 12:34:36.000000000
-0500
-+++ player/plugin/audio/ffmpeg/ffmpeg.cpp 2006-11-18 12:34:50.000000000
-0500
-@@ -166,7 +166,7 @@
- break;
- }
- if (userdata) {
-- ffmpeg->m_c->extradata = (void *)userdata;
-+ ffmpeg->m_c->extradata = const_cast<uint8_t*>(userdata);
- ffmpeg->m_c->extradata_size = ud_size;
- }
- if (avcodec_open(ffmpeg->m_c, ffmpeg->m_codec) < 0) {
---- player/plugin/video/ffmpeg/ffmpeg.cpp.orig 2006-11-18 14:48:11.000000000
-0500
-+++ player/plugin/video/ffmpeg/ffmpeg.cpp 2006-11-18 14:49:22.000000000
-0500
-@@ -255,7 +255,7 @@
- }
- break;
- case CODEC_ID_SVQ3:
-- ffmpeg->m_c->extradata = (void *)userdata;
-+ ffmpeg->m_c->extradata = const_cast<uint8_t*>(userdata);
- ffmpeg->m_c->extradata_size = ud_size;
- if (vinfo != NULL) {
- ffmpeg->m_c->width = vinfo->width;
diff --git a/source/multimedia/mpeg4ip/mpeg4ip-fixes.patch
b/source/multimedia/mpeg4ip/mpeg4ip-fixes.patch
deleted file mode 100644
index 9985065..0000000
--- a/source/multimedia/mpeg4ip/mpeg4ip-fixes.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Nurp mpeg4ip-1.5.0.1/configure.in mpeg4ip-1.5.0.1-p/configure.in
---- mpeg4ip-1.5.0.1/configure.in 2006-06-08 21:15:16.000000000 +0200
-+++ mpeg4ip-1.5.0.1-p/configure.in 2006-11-20 14:22:44.000000000 +0100
-@@ -718,7 +718,7 @@ fi
- AM_CONDITIONAL(USE_MMX, test x$test_use_mmx = xtrue)
-
- dnl Get SDL cflags and SDL libraries to include
--SDL_LIBS="`sdl-config --libs`"
-+SDL_LIBS="`sdl-config --libs` -lX11"
- AC_SUBST(SDL_LIBS)
- SDL_LIB_LIBS="`sdl-config --libs | sed /-lSDLmain/s///`"
- AC_SUBST(SDL_LIB_LIBS)
-@@ -733,7 +733,7 @@ AC_ARG_ENABLE(warns-as-err,
- [if test x$enableval = xno; then
- AC_MSG_NOTICE([compiler warnings will not be errors])
- else
-- BASE_ERR="$BASE_ERR -Werror"
-+ BASE_ERR="$BASE_ERR"
- AC_MSG_NOTICE([enabling compiler warnings as errors])
- fi
- ],
-diff -Nurp mpeg4ip-1.5.0.1/player/src/Makefile.am
mpeg4ip-1.5.0.1-p/player/src/Makefile.am
---- mpeg4ip-1.5.0.1/player/src/Makefile.am 2006-03-10 19:49:44.000000000
+0100
-+++ mpeg4ip-1.5.0.1-p/player/src/Makefile.am 2006-11-20 14:11:18.000000000
+0100
-@@ -206,7 +206,7 @@ mp4player_LDADD = \
- $(top_builddir)/lib/audio/libaudio.la \
- $(top_builddir)/lib/ismacryp/libismacryp.la \
- $(top_builddir)/lib/srtp/libsrtpif.la \
-- @SDL_LIBS@ @SRTPLIB@
-+ @SDL_LIBS@ @SRTPLIB@
-
- gmp4player_LDFLAGS= $(SDL_AUDIO_FLAGS)
- gmp4player_LDADD = $(mp4player_LDADD) \
-diff -Nurp mpeg4ip-1.5.0.1/server/mp4live/video_x264.cpp
mpeg4ip-1.5.0.1-p/server/mp4live/video_x264.cpp
---- mpeg4ip-1.5.0.1/server/mp4live/video_x264.cpp 2006-05-11
22:23:19.000000000 +0200
-+++ mpeg4ip-1.5.0.1-p/server/mp4live/video_x264.cpp 2006-11-20
14:04:26.000000000 +0100
-@@ -32,7 +32,9 @@
-
- static config_index_t CFG_X264_FORCE_BASELINE;
- static config_index_t CFG_X264_USE_CABAC;
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
- static config_index_t CFG_X264_USE_CBR;
-+#endif
- static config_index_t CFG_X264_BIT_RATE_TOLERANCE;
- static config_index_t CFG_X264_USE_VBV;
- static config_index_t CFG_X264_VBV_BITRATE_MULT;
-@@ -44,7 +46,9 @@ static config_index_t CFG_X264_SAR_HEIGH
- static SConfigVariable X264EncoderVariables[] = {
- CONFIG_BOOL(CFG_X264_FORCE_BASELINE, "x264ForceBaseline", false),
- CONFIG_BOOL(CFG_X264_USE_CABAC, "x264UseCabac", true),
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
- CONFIG_BOOL(CFG_X264_USE_CBR, "x264UseCbr", true),
-+#endif
- CONFIG_FLOAT(CFG_X264_BIT_RATE_TOLERANCE, "x264BitRateTolerance", 1.0),
- CONFIG_BOOL(CFG_X264_USE_VBV, "x264UseVbv", false),
- CONFIG_FLOAT(CFG_X264_VBV_BITRATE_MULT, "x264VbvBitRateMult", 1.0),
-@@ -56,7 +60,9 @@ static SConfigVariable X264EncoderVariab
-
- GUI_BOOL(gui_baseline, CFG_X264_FORCE_BASELINE, "Force Baseline (overrides
below)");
- GUI_BOOL(gui_cabac, CFG_X264_USE_CABAC, "Use Cabac");
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
- GUI_BOOL(gui_cbr, CFG_X264_USE_CBR, "Use CBR");
-+#endif
- GUI_BOOL(gui_bframe, CFG_VIDEO_USE_B_FRAMES, "Use B Frames");
- GUI_INT_RANGE(gui_bframenum, CFG_VIDEO_NUM_OF_B_FRAMES, "Number of B frames",
1, 4);
-
-@@ -75,7 +81,9 @@ GUI_INT_RANGE(gui_sar_h, CFG_X264_SAR_HE
- DECLARE_TABLE(x264_gui_options) = {
- TABLE_GUI(gui_baseline),
- TABLE_GUI(gui_cabac),
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
- TABLE_GUI(gui_cbr),
-+#endif
- TABLE_GUI(gui_bframe),
- TABLE_GUI(gui_bframenum),
- TABLE_GUI(gui_brate),
-@@ -168,7 +176,11 @@ bool CX264VideoEncoder::Init (void)
- m_param.i_bframe = 0;
- //debug_message("h264 b frames %d", m_param.i_bframe);
- m_param.rc.i_bitrate = Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE);
-+#ifndef HAVE_X264_PARAM_T_RC_I_RC_METHOD
- m_param.rc.b_cbr = Profile()->GetBoolValue(CFG_X264_USE_CBR) ? 1 : 0;
-+#else
-+ m_param.rc.i_rc_method = X264_RC_ABR;
-+#endif
- m_param.rc.f_rate_tolerance =
Profile()->GetFloatValue(CFG_X264_BIT_RATE_TOLERANCE);
- if (Profile()->GetBoolValue(CFG_X264_USE_VBV)) {
- if (Profile()->GetBoolValue(CFG_X264_FORCE_BASELINE)) {
-diff -Nurp mpeg4ip-1.5.0.1/server/mp4live/video_x264.h
mpeg4ip-1.5.0.1-p/server/mp4live/video_x264.h
---- mpeg4ip-1.5.0.1/server/mp4live/video_x264.h 2005-12-19
18:47:26.000000000 +0100
-+++ mpeg4ip-1.5.0.1-p/server/mp4live/video_x264.h 2006-11-20
14:04:26.000000000 +0100
-@@ -33,6 +33,10 @@ extern "C" {
- }
- #endif
-
-+#if X264_BUILD > 47
-+#define HAVE_X264_PARAM_T_RC_I_RC_METHOD
-+#endif
-+
- class CX264VideoEncoder : public CVideoEncoder {
- public:
- CX264VideoEncoder(CVideoProfile *vp,
diff --git a/source/multimedia/mpeg4ip/type_basic.cpp_compile.patch
b/source/multimedia/mpeg4ip/type_basic.cpp_compile.patch
new file mode 100644
index 0000000..8f15e0d
--- /dev/null
+++ b/source/multimedia/mpeg4ip/type_basic.cpp_compile.patch
@@ -0,0 +1,12 @@
+diff -Naurp mpeg4ip-1.6/common/video/iso-mpeg4/src/type_basic.cpp
mpeg4ip-1.6-p/common/video/iso-mpeg4/src/type_basic.cpp
+--- mpeg4ip-1.6/common/video/iso-mpeg4/src/type_basic.cpp 2006-08-03
20:30:21.000000000 +0200
++++ mpeg4ip-1.6-p/common/video/iso-mpeg4/src/type_basic.cpp 2007-09-20
16:22:06.000000000 +0200
+@@ -317,7 +317,7 @@ Void CMotionVector::computeMV ()
+ iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
+ }
+
+-Void CMotionVector::setToZero (Void)
++Void CMotionVector::setToZero ()
+ {
+ memset (this, 0, sizeof (*this));
+ }
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
