From f75987135703dc9183fe95d6f74e8238444e7c76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 28 Mar 2006 18:11:01 +0000 Subject: [PATCH] Version bump to update autotools support, see bug #127866. Package-Manager: portage-2.1_pre7-r2 --- media-libs/smpeg/ChangeLog | 9 +- media-libs/smpeg/Manifest | 28 +++- media-libs/smpeg/files/digest-smpeg-0.4.4-r8 | 6 + .../smpeg/files/smpeg-0.4.4-automake.patch | 13 ++ .../smpeg/files/smpeg-0.4.4-flags.patch | 129 ++++++++++++++++++ media-libs/smpeg/smpeg-0.4.4-r8.ebuild | 68 +++++++++ 6 files changed, 249 insertions(+), 4 deletions(-) create mode 100644 media-libs/smpeg/files/digest-smpeg-0.4.4-r8 create mode 100644 media-libs/smpeg/files/smpeg-0.4.4-automake.patch create mode 100644 media-libs/smpeg/files/smpeg-0.4.4-flags.patch create mode 100644 media-libs/smpeg/smpeg-0.4.4-r8.ebuild diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog index 1a2b7ff2f036..24c3080a755e 100644 --- a/media-libs/smpeg/ChangeLog +++ b/media-libs/smpeg/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/smpeg # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.33 2006/03/22 22:07:39 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.34 2006/03/28 18:11:01 flameeyes Exp $ + +*smpeg-0.4.4-r8 (28 Mar 2006) + + 28 Mar 2006; Diego Pettenò + +files/smpeg-0.4.4-automake.patch, +files/smpeg-0.4.4-flags.patch, + +smpeg-0.4.4-r8.ebuild: + Version bump to update autotools support, see bug #127866. 22 Mar 2006; Michael Hanselmann smpeg-0.4.4-r7.ebuild: Stable on ppc. diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest index 9dd792008183..e54ded7c426e 100644 --- a/media-libs/smpeg/Manifest +++ b/media-libs/smpeg/Manifest @@ -1,18 +1,30 @@ -MD5 09f8c58df0cd9a06a899a032f5b7131d ChangeLog 4667 -RMD160 748bb9dc8e14602e1dcfb6cda768a6e665587272 ChangeLog 4667 -SHA256 282142d7706a0bcff609bb552912169e5621c813b8e1cecbd9660b10a5d2f60f ChangeLog 4667 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 d3031c2880cf498201b07d96f8cc9b95 ChangeLog 4911 +RMD160 6e06159c9a5086a26a5b2fed71826d5e438324ad ChangeLog 4911 +SHA256 c1c25479e11501ddf14ffd517b3e3270f7d6e4cca9d8af3ba12cd4f21e2dad40 ChangeLog 4911 MD5 228adf6a40bb4eef222c38d23f97014b files/digest-smpeg-0.4.4-r6 63 RMD160 1faea90a7ed60674531b06145d6edadebd28c5ba files/digest-smpeg-0.4.4-r6 63 SHA256 0df9c04ef67815b27e85fdbfab507a6237fea9e80ae8f8ec88d8f309cb7e951e files/digest-smpeg-0.4.4-r6 63 MD5 5e6ac360ffb7bc06f5e84dfcf10f6351 files/digest-smpeg-0.4.4-r7 235 RMD160 81735fa25459610b96f89101e98f40ffa1e43090 files/digest-smpeg-0.4.4-r7 235 SHA256 1559afb84e0cc3bc6594906c50af3def3857f43b47c70e85a1307251c22c45e8 files/digest-smpeg-0.4.4-r7 235 +MD5 6b606861eac5335ad46ca2e733526c08 files/digest-smpeg-0.4.4-r8 491 +RMD160 b0ef3b2169ce6cea8dae35661784c36a9dfb8d2c files/digest-smpeg-0.4.4-r8 491 +SHA256 0cc8ff5615246cee27638772b835648ad0a3d811c8279e19c772d447cdfff809 files/digest-smpeg-0.4.4-r8 491 MD5 3ab2c17a1fa8a3c293ec83d7f4d45515 files/smpeg-0.4.4-PIC.patch 9472 RMD160 c0ee00ca02c1ed2f5ce1890065864175f6cb8eb1 files/smpeg-0.4.4-PIC.patch 9472 SHA256 a9fd3b892e06a00e31fedf719df0ff2bccac0542da9d1008d90712086ccc310f files/smpeg-0.4.4-PIC.patch 9472 +MD5 36b282cce299b55a28b29a90a0dc1d33 files/smpeg-0.4.4-automake.patch 320 +RMD160 702a601b3dfc925b29d5c11926af56d6c9fa2578 files/smpeg-0.4.4-automake.patch 320 +SHA256 2d6d8fbc92e9f040d56ae597282385b5bd68d308931228dfe3a1a453b6c18eda files/smpeg-0.4.4-automake.patch 320 MD5 f70fffdbc4af6ca684817ede925c6087 files/smpeg-0.4.4-config.patch 472 RMD160 4f4d726cfb127b5fa1de977f205e20ed14ef5947 files/smpeg-0.4.4-config.patch 472 SHA256 e64c070d1e69900c76515bd79130473847a407bab14990862aeb2b84ac58848a files/smpeg-0.4.4-config.patch 472 +MD5 e118336034f116326f4599bb360c50b7 files/smpeg-0.4.4-flags.patch 4576 +RMD160 a5c49c9ff594763979d9fa89d63836f7e06c65bd files/smpeg-0.4.4-flags.patch 4576 +SHA256 f314d176c7eb423cee37281580738936d824f1f5cb168a24729b460255c6ac77 files/smpeg-0.4.4-flags.patch 4576 MD5 8b979a58307d7196655758bd3d2466c4 files/smpeg-0.4.4-gcc41.patch 1390 RMD160 20e11bfe56a0d95bb8e8d1d2f7430c164258bb9f files/smpeg-0.4.4-gcc41.patch 1390 SHA256 e37883e2cc7588539db6b374f6641e62c3db48f8c188c05c4fbf3ddbf5db3112 files/smpeg-0.4.4-gcc41.patch 1390 @@ -31,3 +43,13 @@ SHA256 39d908aa81ba2b80e97b578ebc8277fec913b6d60942811fd5a3011d5c34470f smpeg-0. MD5 dd5b38145eb14673b21c79bbd6e05f26 smpeg-0.4.4-r7.ebuild 1685 RMD160 5e2bda43ac2c8b668faf4269c12d2b1f6dd75653 smpeg-0.4.4-r7.ebuild 1685 SHA256 bec26349e68ac49e45e705d087c9afc627bb48b25114e6de2d2d39aa126a689a smpeg-0.4.4-r7.ebuild 1685 +MD5 79541ca56c626eb756d1963523446ea6 smpeg-0.4.4-r8.ebuild 1788 +RMD160 d7e767956024b200abd3d90adb6bc00e0bbc691a smpeg-0.4.4-r8.ebuild 1788 +SHA256 ebe864df69cbbf9c548fa8810ac6873b68fcd1a85542c809a80900731a4608bf smpeg-0.4.4-r8.ebuild 1788 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2.2 (GNU/Linux) + +iD8DBQFEKXxBAiZjviIA2XgRAlzYAJ0VD+lKGiUtk7bH34uTq7gklajCuQCfTiUY +agsVDq8UBi+9HkPOJCtLLMk= +=13ts +-----END PGP SIGNATURE----- diff --git a/media-libs/smpeg/files/digest-smpeg-0.4.4-r8 b/media-libs/smpeg/files/digest-smpeg-0.4.4-r8 new file mode 100644 index 000000000000..d97b5615ed6a --- /dev/null +++ b/media-libs/smpeg/files/digest-smpeg-0.4.4-r8 @@ -0,0 +1,6 @@ +MD5 49c7a926f4e841590ea7a9305c42bced smpeg-0.4.4-gtkm4.patch.bz2 3894 +RMD160 fbef70da1b1a9f5d482c9506286c9f8e7ce764d8 smpeg-0.4.4-gtkm4.patch.bz2 3894 +SHA256 85c1c2126bd0e405092f3f08caace3503997fd0447989fdd175c7f39c3f6091b smpeg-0.4.4-gtkm4.patch.bz2 3894 +MD5 59c76ac704088ef5539210190c4e1fe3 smpeg-0.4.4.tar.gz 315054 +RMD160 d55249ad53417fa0df3d925aed0e83d2204e28b7 smpeg-0.4.4.tar.gz 315054 +SHA256 1efa7984d0aada0c2954cd0aaef357e9d7871dadd3368dbe742ab5f260523e57 smpeg-0.4.4.tar.gz 315054 diff --git a/media-libs/smpeg/files/smpeg-0.4.4-automake.patch b/media-libs/smpeg/files/smpeg-0.4.4-automake.patch new file mode 100644 index 000000000000..e541e1950113 --- /dev/null +++ b/media-libs/smpeg/files/smpeg-0.4.4-automake.patch @@ -0,0 +1,13 @@ +Index: smpeg-0.4.4/configure.in +=================================================================== +--- smpeg-0.4.4.orig/configure.in ++++ smpeg-0.4.4/configure.in +@@ -53,6 +53,8 @@ AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + AC_PROG_INSTALL + ++AM_PROG_AS ++ + dnl Work around the lack of certain typedefs. + AC_TYPE_SOCKLEN_T + diff --git a/media-libs/smpeg/files/smpeg-0.4.4-flags.patch b/media-libs/smpeg/files/smpeg-0.4.4-flags.patch new file mode 100644 index 000000000000..d6b50f30d1bf --- /dev/null +++ b/media-libs/smpeg/files/smpeg-0.4.4-flags.patch @@ -0,0 +1,129 @@ +Index: smpeg-0.4.4/configure.in +=================================================================== +--- smpeg-0.4.4.orig/configure.in ++++ smpeg-0.4.4/configure.in +@@ -60,7 +60,7 @@ dnl The alpha architecture needs special + case "$target" in + alpha*-*-linux*) + if test x$ac_cv_prog_gcc = xyes; then +- CFLAGS="$CFLAGS -mcpu=ev4 -Wa,-mall" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -mcpu=ev4 -Wa,-mall" + fi + ;; + sparc*-*-solaris*) +@@ -102,17 +102,17 @@ AC_ARG_ENABLE(debug, + , enable_debug=yes) + if test x$enable_debug != xyes; then + if test x$ac_cv_prog_gcc = xyes; then +- CFLAGS="$CFLAGS -fexpensive-optimizations -fomit-frame-pointer" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -fexpensive-optimizations -fomit-frame-pointer" + fi + case "$target" in + i486-*-*) # Yeah right. :) + if test x$ac_cv_prog_gcc = xyes; then +- CFLAGS="$CFLAGS -march=486" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -march=486" + fi + ;; + i?86-*-*) + if test x$ac_cv_prog_gcc = xyes; then +- CFLAGS="$CFLAGS -march=pentium -mcpu=pentiumpro" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -march=pentium -mcpu=pentiumpro" + fi + ;; + esac +@@ -124,7 +124,7 @@ AM_PATH_SDL($SDL_VERSION, + :, + AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) + ) +-CFLAGS="$CFLAGS $SDL_CFLAGS" ++EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + + dnl See if we need to pass -lm for the math library +@@ -145,7 +145,7 @@ if test x$enable_mmx = xyes; then + AC_MSG_RESULT($use_mmx) + + if test x$use_mmx = xyes; then +- CFLAGS="$CFLAGS -DUSE_MMX" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_MMX" + fi + fi + +@@ -162,7 +162,7 @@ if test x$enable_ati = xyes; then + AC_MSG_RESULT($use_ati) + + if test x$use_ati = xyes; then +- CFLAGS="$CFLAGS -DUSE_ATI" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_ATI" + fi + fi + +@@ -171,7 +171,7 @@ AC_ARG_ENABLE(timestamp-sync, + [ --enable-timestamp-sync enable system timestamp sync [default=yes]], + , enable_timestamp_sync=no) + if test x$enable_timestamp_sync = xyes; then +- CFLAGS="$CFLAGS -DUSE_TIMESTAMP_SYNC" ++EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_TIMESTAMP_SYNC" + fi + + dnl Enable the use of the system thread +@@ -179,7 +179,7 @@ AC_ARG_ENABLE(threaded-system, + [ --enable-threaded-system enable system thread [default=no]], + , enable_threaded_system=no) + if test x$enable_threaded_system = xyes; then +- CFLAGS="$CFLAGS -DUSE_SYSTEM_THREAD" ++EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_SYSTEM_THREAD" + fi + + dnl Enable threaded audio +@@ -187,7 +187,7 @@ AC_ARG_ENABLE(threaded-audio, + [ --enable-threaded-audio enable threaded audio [default=yes]], + , enable_threaded_audio=yes) + if test x$enable_threaded_audio = xyes; then +- CFLAGS="$CFLAGS -DTHREADED_AUDIO" ++EXTRA_CFLAGS="$EXTRA_CFLAGS -DTHREADED_AUDIO" + fi + + dnl See if we can build the GTk player +@@ -198,7 +198,7 @@ have_gtk=no + if test x$enable_gtk_player = xyes; then + AM_PATH_GTK(1.2.1, have_gtk=yes) + if test x$have_gtk = xyes; then +- CFLAGS="$CFLAGS $GTK_CFLAGS" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS $GTK_CFLAGS" + fi + AC_SUBST(GTK_LIBS) + fi +@@ -224,7 +224,7 @@ if test x$enable_opengl_player = xyes; t + AC_PATH_X + AC_PATH_XTRA + if test x$have_x = xyes; then +- CFLAGS="$CFLAGS $X_CFLAGS" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" + SYS_GL_LIBS="$X_LIBS -lGL -lGLU" + else + SYS_GL_LIBS="-lGL -lGLU" +@@ -255,17 +255,16 @@ AC_ARG_ENABLE(assertions, + [ --enable-assertions Enable consistency checks in decoding [default=no]], + , enable_assertions=no) + if test x$enable_assertions != xyes; then +- CFLAGS="$CFLAGS -DNDEBUG" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -DNDEBUG" + fi + + dnl Add the source include directories +-CFLAGS="$CFLAGS -I.. -DNOCONTROLS" +-CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/audio -I\$(top_srcdir)/video" +-CXXFLAGS="$CFLAGS" +- ++EXTRA_CFLAGS="$EXTRA_CFLAGS -I.. -DNOCONTROLS" ++EXTRA_CFLAGS="$EXTRA_CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/audio -I\$(top_srcdir)/video" ++CXXFLAGS="$EXTRA_CFLAGS $CXXFLAGS" ++CFLAGS="$EXTRA_CFLAGS $CFLAGS" + + dnl C++ flags are the same as the C flags +-CXXFLAGS="$CFLAGS" + if test x$GCC = xyes; then + # Check to see if options -fno-rtti -fno-exceptions are supported + AC_MSG_CHECKING(if $CXX supports -fno-rtti -fno-exceptions) diff --git a/media-libs/smpeg/smpeg-0.4.4-r8.ebuild b/media-libs/smpeg/smpeg-0.4.4-r8.ebuild new file mode 100644 index 000000000000..4094d7b254bf --- /dev/null +++ b/media-libs/smpeg/smpeg-0.4.4-r8.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r8.ebuild,v 1.1 2006/03/28 18:11:01 flameeyes Exp $ + +inherit eutils toolchain-funcs autotools + +DESCRIPTION="SDL MPEG Player Library" +HOMEPAGE="http://www.lokigames.com/development/smpeg.php3" +SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz + mirror://gentoo/${P}-gtkm4.patch.bz2" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86" +IUSE="X debug gtk mmx opengl" + +DEPEND=">=media-libs/libsdl-1.2.0 + opengl? ( + virtual/opengl + virtual/glu ) + gtk? ( =x11-libs/gtk+-1.2* ) + X? ( || ( + ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libX11 ) + virtual/x11 ) )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-m4.patch + epatch "${FILESDIR}"/${P}-gnu-stack.patch + epatch "${FILESDIR}"/${P}-config.patch + epatch "${FILESDIR}"/${P}-PIC.patch + epatch "${FILESDIR}"/${P}-gcc41.patch + epatch "${FILESDIR}"/${P}-flags.patch + epatch "${FILESDIR}"/${P}-automake.patch + + cd "${WORKDIR}" + epatch "${DISTDIR}"/${P}-gtkm4.patch.bz2 + rm "${S}/acinclude.m4" + + cd "${S}" + WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" AT_M4DIR="${S}/m4" eautoreconf +} + +src_compile() { + tc-export CC CXX RANLIB AR + + # the debug option is bogus ... all it does is add extra + # optimizations if you pass --disable-debug + econf \ + $(use_enable debug assertions) \ + $(use_enable gtk gtk-player) \ + $(use_with X x) \ + $(use_enable opengl opengl-player) \ + $(use_enable mmx) \ + --enable-debug \ + || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc CHANGES README* TODO +} -- 2.26.2