Version bump

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 3680fc95a9ca426f89b956648a793c75e4e079db..c4d30334809840d4c4f29d744b5198de1d610d10 100644 (file)
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.15 2004/11/06 03:18:29 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.16 2004/12/04 06:06:07 tester Exp $
+
+*mpeg4ip-1.2 (04 Dec 2004)
+
+  04 Dec 2004; Olivier Crete <tester@gentoo.org>
+  +files/mpeg4ip-1.2-gentoo-fixes.patch, +mpeg4ip-1.2.ebuild:
+  Version bimp, disabled ffmpeg support because it just doesnt build
 
   05 Nov 2004; Travis Tilley <lv@gentoo.org> mpeg4ip-1.1.ebuild:
   fix a silly libdir bug and mark 1.1 stable on amd64

diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index dd2585cc89ab6143946a6a70f37fc6ebb83940af..012b7de9b4927851bbf01ebfeefb437cae086dd8 100644 (file)
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,8 +1,21 @@
-MD5 81fbcb36197f7afdc2f80f39f22da525 ChangeLog 2741
-MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d3901fe672ba3d47273a123d16228c72 mpeg4ip-1.0.ebuild 2205
+MD5 6da10e4017c8bb23f44b335566a1a34d ChangeLog 2954
+MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
+MD5 b8295107fa73d32d4506936ef3dacd01 mpeg4ip-1.2.ebuild 1666
 MD5 65f6ffc28c1d4afc6c2494d7289570d6 mpeg4ip-1.1.ebuild 1638
-MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64
 MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
-MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110
+MD5 e1adf5b673be8f3eede637fc5ea66aa3 files/digest-mpeg4ip-1.2 64
 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844
+MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64
+MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110
+MD5 9e47aed0879b65f65414ed33fafa743c files/mpeg4ip-1.2-gentoo-fixes.patch 337
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBsVQIwDHaUUJ0mYMRAusJAJ9kdkRkXqWsWsi8VuOuOIvExHvHvwCgm3xv
+K1EQbILrgNS3yaq8FOJklLI=
+=tRcu
+-----END PGP SIGNATURE-----

diff --git a/media-video/mpeg4ip/files/digest-mpeg4ip-1.2 b/media-video/mpeg4ip/files/digest-mpeg4ip-1.2
new file mode 100644 (file)
index 0000000..a30e875
--- /dev/null
+++ b/media-video/mpeg4ip/files/digest-mpeg4ip-1.2
@@ -0,0 +1 @@
+MD5 d9c687ec1aaddf17f6462ed5bd35e5d3 mpeg4ip-1.2.tar.gz 4325118

diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.2-gentoo-fixes.patch b/media-video/mpeg4ip/files/mpeg4ip-1.2-gentoo-fixes.patch
new file mode 100644 (file)
index 0000000..9e2a30a
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.2-gentoo-fixes.patch
@@ -0,0 +1,11 @@
+--- server/mp4live/gui/gui_utils.cpp.orig      2004-11-05 14:08:09.002486512 -0500
++++ server/mp4live/gui/gui_utils.cpp   2004-11-05 14:08:10.505258056 -0500
+@@ -352,7 +352,7 @@
+ {
+   char buffer[80];
+   
+-  sprintf(buffer, "%u", value);
++  sprintf(buffer, "%lu",(unsigned long int)value);
+   gtk_entry_set_text(GTK_ENTRY(entry), buffer);
+ }
+ 

diff --git a/media-video/mpeg4ip/mpeg4ip-1.2.ebuild b/media-video/mpeg4ip/mpeg4ip-1.2.ebuild
new file mode 100644 (file)
index 0000000..5357844
--- /dev/null
+++ b/media-video/mpeg4ip/mpeg4ip-1.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.2.ebuild,v 1.1 2004/12/04 06:06:07 tester Exp $
+
+inherit eutils
+
+DESCRIPTION="MPEG 4 implementation library"
+
+HOMEPAGE="http://www.mpeg4ip.net/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE="ipv6 mmx gtk v4l2 xvid nas alsa esd arts"
+
+RDEPEND="sys-devel/libtool
+       sys-devel/autoconf
+       sys-devel/automake
+       >=media-libs/faac-1.20.1
+       >=media-sound/lame-3.92
+       gtk? ( >=x11-libs/gtk+-2 )
+       media-libs/libid3tag
+       xvid? ( media-libs/xvid )
+       nas? ( media-libs/nas virtual/x11 )
+       alsa? ( media-libs/alsa-lib )
+       arts? ( kde-base/arts )
+       esd? ( media-sound/esound )"
+
+DEPEND="${RDEPEND}
+       x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       sed -i -e 's/-Wmissing-prototypes//g' -e 's/-Werror//g' configure
+
+       epatch ${FILESDIR}/mpeg4ip-1.2-gentoo-fixes.patch
+}
+
+src_compile() {
+       cd ${S}
+
+       local myconf
+
+       # mp4live doesnt build, disable it..
+       myconf=" $(use_enable ipv6)
+                       $(use_enable mmx)
+                       $(use_enable ppc)
+                       $(use_enable nas)
+                       $(use_enable esd)
+                       $(use_enable alsa)
+                       $(use_enable arts)"
+       use v4l2 || myconf="${myconf} --disable-v4l2"
+
+       # ffmpeg support doesnt build even on gcc 3.3
+       # and the configure script is broken so --disable doesnt work
+       sed -i -e 's/have_ffmpeg=true/have_ffmpeg=false/' configure
+
+       econf ${myconf} || die "configure failed"
+
+       emake || die "make failed"
+}
+
+src_install () {
+       cd ${S}
+       make install DESTDIR="${D}" || die "make install failed"
+}