Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=7b7a3f8c1d44e39a63bd1b71fa718c01ec4535e6
commit 7b7a3f8c1d44e39a63bd1b71fa718c01ec4535e6 Author: kikadf <[email protected]> Date: Wed Feb 25 11:12:05 2015 +0100 mpeg4ip-1.6-12-x86_64 * Remove, dead since 2007 diff --git a/source/multimedia/mpeg4ip/FrugalBuild b/source/multimedia/mpeg4ip/FrugalBuild deleted file mode 100644 index 9c5969f..0000000 --- a/source/multimedia/mpeg4ip/FrugalBuild +++ /dev/null @@ -1,109 +0,0 @@ -# Compiling Time: 4.53 SBU -# Maintainer: crazy <[email protected]> - -pkgname=mpeg4ip -pkgver=1.6 -pkgrel=12 -pkgdesc="mpeg4ip provides an end-to-end system to explore streaming multimedia" -Finclude sourceforge -depends=("libmp4v2=$pkgver") -makedepends=('id3lib' 'sdl' 'gtk+2>=2.20.1' 'faad2' 'mpeg2dec>=0.4.1' 'x264>=20120904' \ - 'freetype2' 'libice' \ - 'alsa-lib' 'srtp' 'twolame' 'xcb-util-renderutil>=0.3.8') -groups=('multimedia') -options=('scriptlet') -archs=('i686' 'x86_64') -up2date="$pkgver" -source=($source autoreconf.patch \ - type_basic.cpp_compile.patch alsa.patch \ - build-with-werror-is-a-configure-option.patch \ - from-mpeg4ip-1.6.1-mp4v2_fixes.patch \ - ffmpeg_includes.diff compile.diff ffmpeg_compile.diff \ - glib210.diff gcc44.diff ffmpeg20090403.patch error.patch fixes.patch) -sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \ - '40b3370027cace5e3cfecfbf15798bf0ade5f036' \ - '9657405dfe23cd8baeb4ea419cd5f036b03fa8c8' \ - 'ec4cf44483d9e92afb97e7eb0866da5813577464' \ - 'a2f18f62986a7f19acce4c788e8ce30d3c3e0691' \ - '5a2944a6ea56fd255cafef7626eaed60fed170e2' \ - 'b249e44b3407a4468325ded3a901d01ec86e6711' \ - '93dd0e66761a1cc6e3e68fd0fd242f1b886c0d6e' \ - '38803376dfb3f467e2cfc2eaff97a4f41a11191c' \ - 'd192c1ffe672755d44e4e6c4aec1b35f7e9c1970' \ - '5e8e629f8e26d1fc2cc951ecdb46b18811aec847' \ - 'bd2a96a5222f532a11a67fe497ff47252095ec1a' \ - '52ec4e0e872d86203e40fd51d475ddb5ece6e13d' \ - 'e0bbf42cb32173689e28c95a11a8c99f08b96cbe') - -subpkgs=("$pkgname-player" "$pkgname-server" "$pkgname-utils") -subdescs=('mpeg4ip player' 'mpeg4ip server' 'mpeg4ip utils') -subdepends=("gtk+2 sdl mpeg2dec id3lib alsa-lib faad2 libmad" \ - "twolame" "sdl") -subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver $pkgname-player=$pkgver" "$pkgname=$pkgver") -subgroups=('xmultimedia' 'xmultimedia-extra' 'xmultimedia-extra') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') - -build() -{ - Fcd - Fsed '-Werror' '' player/lib/audio/faad/Makefile.in - Fsed '-Werror' '' player/lib/audio/faad/Makefile.am - ## 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 - Fautoreconf - export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - export CFLAGS="${CFLAGS} -fno-strict-aliasing" - if [ "$CARCH" == "x86_64" ]; then - CXXFLAGS="$CXXFLAGS -fPIC" - CFLAGS="$CFLAGS -fPIC" - fi - - Fconf \ - --enable-ipv6 \ - --disable-dependency-tracking \ - --disable-warns-as-err \ - --enable-mp4live=yes \ - --enable-alsa=yes \ - --enable-shared-alsa=yes \ - --enable-mp4live-alsa \ - --enable-server=yes \ - --enable-player=yes \ - --enable-srtp \ - --enable-id3tags=yes \ - --enable-mp3lame=yes \ - --enable-faac=yes \ - --enable-x264=yes \ - --enable-ppc=no \ - --enable-xvid=yes \ - --enable-a52dec=yes \ - --enable-mad=yes \ - --enable-mpeg2dec=yes \ - --with-x - - 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 - Fsplit $pkgname-player usr/lib/mp4player_plugin - 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,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 deleted file mode 100644 index 8cb7e2b..0000000 --- a/source/multimedia/mpeg4ip/alsa.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 9c3e8d4..0000000 --- a/source/multimedia/mpeg4ip/autoreconf.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 3cf131d..0000000 --- a/source/multimedia/mpeg4ip/build-with-werror-is-a-configure-option.patch +++ /dev/null @@ -1,10 +0,0 @@ -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/compile.diff b/source/multimedia/mpeg4ip/compile.diff deleted file mode 100644 index f379219..0000000 --- a/source/multimedia/mpeg4ip/compile.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -aur mpeg4ip-1.6/server/mp4live/video_util_resize.h fw_mpeg4ip-1.6/server/mp4live/video_util_resize.h ---- mpeg4ip-1.6/server/mp4live/video_util_resize.h 2005-03-25 21:15:31.000000000 +0100 -+++ fw_mpeg4ip-1.6/server/mp4live/video_util_resize.h 2008-04-29 02:03:53.000000000 +0200 -@@ -90,7 +90,7 @@ - - void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV, - uint32_t fyStride, uint32_t fuStride, uint32_t fvStride, -- uint8_t *tY, uint8_t *tU, uint8_t *fV, -- uint32_t tyStride, uint32_t tvStride, uint32_t tvStride, -+ uint8_t *tY, uint8_t *tU, uint8_t *tV, -+ uint32_t tyStride, uint32_t tuStride, uint32_t tvStride, - uint32_t w, uint32_t h); - #endif diff --git a/source/multimedia/mpeg4ip/error.patch b/source/multimedia/mpeg4ip/error.patch deleted file mode 100644 index 8a48c0b..0000000 --- a/source/multimedia/mpeg4ip/error.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -aur a/lib/rtp/net_udp.c b/lib/rtp/net_udp.c ---- a/lib/rtp/net_udp.c 2012-07-02 23:30:13.968751716 -0500 -+++ b/lib/rtp/net_udp.c 2012-07-02 23:31:34.822748711 -0500 -@@ -163,9 +163,8 @@ - va_end(ap); - rtp_message(LOG_ALERT, "ERROR: %s, (%d - %s)\n", buffer, e, ws_errs[i].errname); - #else -- uint32_t retlen; - va_start(ap, msg); -- retlen = vsnprintf(buffer, blen, msg, ap); -+ vsnprintf(buffer, blen, msg, ap); - va_end(ap); - rtp_message(LOG_ALERT, "%s:%s", buffer, strerror(errno)); - #endif diff --git a/source/multimedia/mpeg4ip/ffmpeg20090403.patch b/source/multimedia/mpeg4ip/ffmpeg20090403.patch deleted file mode 100644 index 1417756..0000000 --- a/source/multimedia/mpeg4ip/ffmpeg20090403.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.cpp 2007-07-02 19:43:14.000000000 +0200 -+++ mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.cpp 2009-12-22 14:29:42.000000000 +0100 -@@ -585,10 +585,20 @@ - from.data[ix] = ffmpeg->m_picture->data[ix]; - from.linesize[ix] = ffmpeg->m_picture->linesize[ix]; - } -- -+#ifdef HAVE_FFMPEG_INSTALLED -+ SwsContext *pSWSCtx; -+ pSWSCtx = sws_getContext(ffmpeg->m_c->width, ffmpeg->m_c->height, -+ ffmpeg->m_c->pix_fmt, -+ ffmpeg->m_c->width, ffmpeg->m_c->height, -+ PIX_FMT_YUV420P, SWS_BICUBIC, 0, 0, 0); -+ sws_scale(pSWSCtx, from.data, from.linesize, 0, ffmpeg->m_c->height, -+ to.data, to.linesize); -+ sws_freeContext(pSWSCtx); -+#else - img_convert(&to, PIX_FMT_YUV420P, - &from, ffmpeg->m_c->pix_fmt, - ffmpeg->m_c->width, ffmpeg->m_c->height); -+#endif - ffmpeg->m_vft->video_filled_buffer(ffmpeg->m_ifptr, - ffmpeg->have_cached_ts ? - ffmpeg->cached_ts : ts); - ---- mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h 2009-12-22 12:09:10.000000000 +0100 -+++ mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h 2009-12-22 14:26:48.000000000 +0100 -@@ -28,6 +28,7 @@ - extern "C" { - #ifdef HAVE_FFMPEG_INSTALLED - #include <libavcodec/avcodec.h> -+#include <libswscale/swscale.h> - #else - #include <avcodec.h> - #endif - - --- mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.cpp 2009-12-22 12:04:12.000000000 +0100 -+++ fw_mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.cpp 2009-12-22 12:04:12.000000000 +0100 -@@ -220,7 +220,7 @@ - uint32_t freq_ts = pts->audio_freq_timestamp; - - do { --#if HAVE_DECL_AVCODEC_DECODE_AUDIO2 != 1 -+#if HAVE_DECL_AVCODEC_DECODE_AUDIO2 != 0 - used = avcodec_decode_audio(ffmpeg->m_c, (short *)ffmpeg->m_outbuf, - &outsize, buffer, left); - #else diff --git a/source/multimedia/mpeg4ip/ffmpeg_compile.diff b/source/multimedia/mpeg4ip/ffmpeg_compile.diff deleted file mode 100644 index e92e0eb..0000000 --- a/source/multimedia/mpeg4ip/ffmpeg_compile.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff -aur mpeg4ip-1.6/server/mp4live/video_ffmpeg.cpp fw_mpeg4ip-1.6/server/mp4live/video_ffmpeg.cpp ---- mpeg4ip-1.6/server/mp4live/video_ffmpeg.cpp 2007-01-30 22:38:19.000000000 +0100 -+++ fw_mpeg4ip-1.6/server/mp4live/video_ffmpeg.cpp 2008-04-29 02:39:14.000000000 +0200 -@@ -120,26 +120,15 @@ - m_avctx->height = Profile()->m_videoHeight; - m_avctx->bit_rate = - Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE) * 1000; --#ifndef HAVE_AVCODECCONTEXT_TIME_BASE -- m_avctx->frame_rate = (int)(Profile()->GetFloatValue(CFG_VIDEO_FRAME_RATE) + 0.5); -- m_avctx->frame_rate_base = 1; --#else - m_avctx->time_base = (AVRational){1, (int)(Profile()->GetFloatValue(CFG_VIDEO_FRAME_RATE) + .5)}; - m_avctx->pix_fmt = PIX_FMT_YUV420P; - m_avctx->me_method = ME_EPZS; --#endif - if (Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH) > 0 && - Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT) > 0) { --#ifndef HAVE_AVRATIONAL -- float asp = (float)Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH); -- asp /= (float)Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT); -- m_avctx->aspect_ratio = asp; --#else - AVRational asp = - {Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH), - Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT)}; - m_avctx->sample_aspect_ratio = asp; --#endif - } - - #if 0 diff --git a/source/multimedia/mpeg4ip/ffmpeg_includes.diff b/source/multimedia/mpeg4ip/ffmpeg_includes.diff deleted file mode 100644 index dcd9b66..0000000 --- a/source/multimedia/mpeg4ip/ffmpeg_includes.diff +++ /dev/null @@ -1,62 +0,0 @@ -diff -aur mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.h fw_mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.h ---- mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.h 2007-07-02 19:43:14.000000000 +0200 -+++ fw_mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.h 2008-04-29 01:07:31.000000000 +0200 -@@ -26,7 +26,7 @@ - #include "codec_plugin.h" - extern "C" { - #ifdef HAVE_FFMPEG_INSTALLED --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - #else - #include <avcodec.h> - #endif -diff -aur mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h fw_mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h ---- mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h 2007-07-02 19:43:14.000000000 +0200 -+++ fw_mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h 2008-04-29 01:08:26.000000000 +0200 -@@ -27,7 +27,7 @@ - #include "codec_plugin.h" - extern "C" { - #ifdef HAVE_FFMPEG_INSTALLED --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - #else - #include <avcodec.h> - #endif -diff -aur mpeg4ip-1.6/server/mp4live/audio_ffmpeg.h fw_mpeg4ip-1.6/server/mp4live/audio_ffmpeg.h ---- mpeg4ip-1.6/server/mp4live/audio_ffmpeg.h 2007-07-02 19:43:14.000000000 +0200 -+++ fw_mpeg4ip-1.6/server/mp4live/audio_ffmpeg.h 2008-04-29 02:13:50.000000000 +0200 -@@ -25,7 +25,7 @@ - #include "audio_encoder.h" - extern "C" { - #ifdef HAVE_FFMPEG_INSTALLED --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - #else - #include <avcodec.h> - #endif -diff -aur mpeg4ip-1.6/server/mp4live/video_ffmpeg.h fw_mpeg4ip-1.6/server/mp4live/video_ffmpeg.h ---- mpeg4ip-1.6/server/mp4live/video_ffmpeg.h 2007-07-02 19:43:14.000000000 +0200 -+++ fw_mpeg4ip-1.6/server/mp4live/video_ffmpeg.h 2008-04-29 02:15:13.000000000 +0200 -@@ -25,7 +25,7 @@ - #include "video_encoder.h" - extern "C" { - #ifdef HAVE_FFMPEG_INSTALLED --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - #else - #include <avcodec.h> - #endif -diff -aur mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp fw_mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp ---- mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp 2007-07-02 19:43:14.000000000 +0200 -+++ fw_mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp 2008-04-29 02:24:15.000000000 +0200 -@@ -27,7 +27,7 @@ - #ifdef HAVE_FFMPEG - extern "C" { - #ifdef HAVE_FFMPEG_INSTALLED --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - #else - #include <avcodec.h> - #endif - - diff --git a/source/multimedia/mpeg4ip/fixes.patch b/source/multimedia/mpeg4ip/fixes.patch deleted file mode 100644 index 9a4ef0d..0000000 --- a/source/multimedia/mpeg4ip/fixes.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur a/common/video/iso-mpeg4/configure.in b/common/video/iso-mpeg4/configure.in ---- a/common/video/iso-mpeg4/configure.in 2005-05-04 14:55:58.000000000 -0500 -+++ b/common/video/iso-mpeg4/configure.in 2013-10-29 02:05:41.620852623 -0500 -@@ -1,6 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT([mpeg4-2000], 1.2.3) --AM_CONFIG_HEADER(mpeg4-2000.h) -+AC_CONFIG_HEADERS([mpeg4-2000.h]) - dnl Detect the canonical host and target build environment - AC_CANONICAL_HOST - AC_CANONICAL_TARGET -diff -ur a/configure.in b/configure.in ---- a/configure.in 2007-09-18 15:43:13.000000000 -0500 -+++ b/configure.in 2013-10-29 02:01:06.964862835 -0500 -@@ -1,7 +1,7 @@ - - dnl Process this file with autoconf to produce a configure script. - AC_INIT(mpeg4ip, 1.6) --AM_CONFIG_HEADER(mpeg4ip_config.h) -+AC_CONFIG_HEADERS([mpeg4ip_config.h]) - dnl Prevent user from running just ./configure - AC_CHECK_FILE(./bootstrapped, [did_bootstrap=yes], [did_bootstrap=no]) - if test x$did_bootstrap = xno; then diff --git a/source/multimedia/mpeg4ip/from-mpeg4ip-1.6.1-mp4v2_fixes.patch b/source/multimedia/mpeg4ip/from-mpeg4ip-1.6.1-mp4v2_fixes.patch deleted file mode 100644 index 6f3ba04..0000000 --- a/source/multimedia/mpeg4ip/from-mpeg4ip-1.6.1-mp4v2_fixes.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4.cpp ---- mpeg4ip-1.6/lib/mp4v2/mp4.cpp 2007-07-19 20:09:44.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4.cpp 2007-09-28 22:45:11.000000000 +0200 -@@ -119,15 +119,16 @@ - try { - pFile = new MP4File(verbosity); - // LATER useExtensibleFormat, moov first, then mvex's -- pFile->Modify(fileName); -+ if (pFile->Modify(fileName)) - return (MP4FileHandle)pFile; - } - catch (MP4Error* e) { - VERBOSE_ERROR(verbosity, e->Print()); - delete e; -- delete pFile; -- return MP4_INVALID_FILE_HANDLE; - } -+ -+ if (pFile) delete pFile; -+ return MP4_INVALID_FILE_HANDLE; - } - - extern "C" bool MP4Optimize(const char* existingFileName, -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4file.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4file.cpp ---- mpeg4ip-1.6/lib/mp4v2/mp4file.cpp 2007-07-05 18:38:02.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4file.cpp 2007-09-28 22:45:11.000000000 +0200 -@@ -195,7 +195,7 @@ - } - - --void MP4File::Modify(const char* fileName) -+bool MP4File::Modify(const char* fileName) - { - m_fileName = MP4Stralloc(fileName); - m_mode = 'r'; -@@ -211,7 +211,8 @@ - - if (pMoovAtom == NULL) { - // there isn't one, odd but we can still proceed -- pMoovAtom = AddChildAtom(m_pRootAtom, "moov"); -+ return false; -+ //pMoovAtom = AddChildAtom(m_pRootAtom, "moov"); - } else { - numAtoms = m_pRootAtom->GetNumberOfChildAtoms(); - -@@ -285,6 +286,7 @@ - - // start writing new mdat - pMdatAtom->BeginWrite(Use64Bits("mdat")); -+ return true; - } - - void MP4File::Optimize(const char* orgFileName, const char* newFileName) -@@ -624,7 +626,6 @@ - ASSERT(m_pTracks[i]); - m_pTracks[i]->FinishWrite(); - } -- - // ask root atom to write - m_pRootAtom->FinishWrite(); - -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4file.h mpeg4ip-1.6.1/lib/mp4v2/mp4file.h ---- mpeg4ip-1.6/lib/mp4v2/mp4file.h 2007-06-04 18:21:51.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4file.h 2007-09-28 22:45:11.000000000 +0200 -@@ -56,7 +56,7 @@ - char* majorBrand = NULL, - u_int32_t minorVersion = 0, char** supportedBrands = NULL, - u_int32_t supportedBrandsCount = 0); -- void Modify(const char* fileName); -+ bool Modify(const char* fileName); - void Optimize(const char* orgFileName, - const char* newFileName = NULL); - void Dump(FILE* pDumpFile = NULL, bool dumpImplicits = false); -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4.h mpeg4ip-1.6.1/lib/mp4v2/mp4.h ---- mpeg4ip-1.6/lib/mp4v2/mp4.h 2007-09-19 19:44:49.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4.h 2007-09-28 22:45:11.000000000 +0200 -@@ -1287,6 +1287,9 @@ - uint32_t decodeSize, - uint32_t *pDataSize); - void MP4Free(void *p); -+ -+ void MP4SetLibFunc(lib_message_func_t libfunc); -+ - #ifdef __cplusplus - } - #endif -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4track.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4track.cpp ---- mpeg4ip-1.6/lib/mp4v2/mp4track.cpp 2007-04-12 19:04:03.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4track.cpp 2007-09-28 22:45:11.000000000 +0200 -@@ -483,6 +483,7 @@ - { - // write out any remaining samples in chunk buffer - WriteChunkBuffer(); -+ - if (m_pStszFixedSampleSizeProperty == NULL && - m_stsz_sample_bits == 4) { - if (m_have_stz2_4bit_sample) { -@@ -646,7 +647,10 @@ - numBytes /= m_bytesPerSample; - } - // for first sample -- if (sampleId == 1) { -+ // wmay - if we are adding, we want to make sure that -+ // we don't inadvertently set up the fixed size again. -+ // so, we check the number of samples -+ if (sampleId == 1 && GetNumberOfSamples() == 0) { - if (m_pStszFixedSampleSizeProperty == NULL || - numBytes == 0) { - // special case of first sample is zero bytes in length -@@ -670,13 +674,15 @@ - // doesn't match our sample size, we need to write the current - // sample size into the table - if (fixedSampleSize == 0 || numBytes != fixedSampleSize) { -- - if (fixedSampleSize != 0) { - // fixed size was set; we need to clear fixed sample size - m_pStszFixedSampleSizeProperty->SetValue(0); - - // and create sizes for all previous samples -- for (MP4SampleId sid = 1; sid < sampleId; sid++) { -+ // use GetNumberOfSamples due to needing the total number -+ // not just the appended part of the file -+ uint32_t samples = GetNumberOfSamples(); -+ for (MP4SampleId sid = 1; sid <= samples; sid++) { - SampleSizePropertyAddValue(fixedSampleSize); - } - } -@@ -1345,7 +1351,8 @@ - (MP4Property**)&m_pStssSampleProperty)); - - // set values for all samples that came before this one -- for (MP4SampleId sid = 1; sid < sampleId; sid++) { -+ uint32_t samples = GetNumberOfSamples(); -+ for (MP4SampleId sid = 1; sid < samples; sid++) { - m_pStssSampleProperty->AddValue(sid); - m_pStssCountProperty->IncrementValue(); - } -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4util.cpp mpeg4ip-1.6.1/lib/mp4v2/mp4util.cpp ---- mpeg4ip-1.6/lib/mp4v2/mp4util.cpp 2007-04-12 19:04:03.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4util.cpp 2007-09-28 22:45:11.000000000 +0200 -@@ -22,8 +22,21 @@ - - #include "mp4common.h" - -+static lib_message_func_t libfunc = NULL; -+extern "C" void MP4SetLibFunc(lib_message_func_t libf) -+{ -+ libfunc = libf; -+} -+ - void MP4Error::Print(FILE* pFile) - { -+ if (libfunc != NULL) { -+ (libfunc)(LOG_ERR, "MP4ERROR", "%s:%s:%s", -+ m_where == NULL ? "" : m_where, -+ m_errstring == NULL ? "" : m_errstring, -+ m_errno ? strerror(m_errno) : ""); -+ return; -+ } - fprintf(pFile, "MP4ERROR: "); - if (m_where) { - fprintf(pFile, "%s", m_where); -diff -Naur -X no mpeg4ip-1.6/lib/mp4v2/mp4util.h mpeg4ip-1.6.1/lib/mp4v2/mp4util.h ---- mpeg4ip-1.6/lib/mp4v2/mp4util.h 2007-05-24 21:13:17.000000000 +0200 -+++ mpeg4ip-1.6.1/lib/mp4v2/mp4util.h 2007-09-28 22:45:11.000000000 +0200 -@@ -26,8 +26,7 @@ - #ifndef ASSERT - #define ASSERT(expr) \ - if (!(expr)) { \ -- (void)fflush(stdout); \ -- assert((expr)); \ -+ throw new MP4Error("assert failure", __STRING((expr))); \ - } - #endif - #define WARNING(expr) \ diff --git a/source/multimedia/mpeg4ip/gcc44.diff b/source/multimedia/mpeg4ip/gcc44.diff deleted file mode 100644 index 452d7da..0000000 --- a/source/multimedia/mpeg4ip/gcc44.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru mpeg4ip-1.6.1.orig/player/src/media_utils.cpp mpeg4ip-1.6.1/player/src/media_utils.cpp ---- mpeg4ip-1.6.1.orig/player/src/media_utils.cpp 2007-03-29 20:52:19.000000000 +0200 -+++ mpeg4ip-1.6.1/player/src/media_utils.cpp 2009-06-13 18:44:36.000000000 +0200 -@@ -610,7 +610,7 @@ - session_desc_t *sdp; - - name += strlen("iptv://"); -- slash = strchr(name, '/'); -+ slash = strchr((char*)name, '/'); - if (slash == NULL || slash == name) { - psptr->set_message("Invalid iptv content manager"); - return -1; - - diff --git a/source/multimedia/mpeg4ip/glib210.diff b/source/multimedia/mpeg4ip/glib210.diff deleted file mode 100644 index de1cd8e..0000000 --- a/source/multimedia/mpeg4ip/glib210.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru mpeg4ip-1.6.1.orig/include/mpeg4ip.h mpeg4ip-1.6.1/include/mpeg4ip.h ---- mpeg4ip-1.6.1.orig/include/mpeg4ip.h 2006-08-07 20:27:00.000000000 +0200 -+++ mpeg4ip-1.6.1/include/mpeg4ip.h 2009-06-03 09:53:47.000000000 +0200 -@@ -123,7 +123,6 @@ - #ifdef __cplusplus - extern "C" { - #endif --char *strcasestr(const char *haystack, const char *needle); - #ifdef __cplusplus - } - #endif - diff --git a/source/multimedia/mpeg4ip/type_basic.cpp_compile.patch b/source/multimedia/mpeg4ip/type_basic.cpp_compile.patch deleted file mode 100644 index 8f15e0d..0000000 --- a/source/multimedia/mpeg4ip/type_basic.cpp_compile.patch +++ /dev/null @@ -1,12 +0,0 @@ -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
