add the patch from smpeg to work around bug #538876; rev bump to push out diffs

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/media-libs/smpeg2/ChangeLog b/media-libs/smpeg2/ChangeLog
index 6faeb598cc6a0a85050fa560e2fa50c28779d379..d9d0ccdd6165a93b235b365034637218191f5edd 100644 (file)
--- a/media-libs/smpeg2/ChangeLog
+++ b/media-libs/smpeg2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/smpeg2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg2/ChangeLog,v 1.6 2015/01/29 17:58:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg2/ChangeLog,v 1.7 2015/02/22 07:51:44 mr_bones_ Exp $
+
+*smpeg2-2.0.0-r3 (22 Feb 2015)
+
+  22 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> +smpeg2-2.0.0-r3.ebuild,
+  files/smpeg2-2.0.0-smpeg2-config.patch:
+  add the patch from smpeg to work around bug #538876; rev bump to push out
+  diffs
 
   29 Jan 2015; Michał Górny <mgorny@gentoo.org> smpeg2-2.0.0-r2.ebuild:
   Switch to CPU_FLAGS_X86.

diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index c84af1e07f85702306dd2601c4f514d8f0566b70..9af4a0c714d365355d5444d8c5d56f9cea9cf1be 100644 (file)
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,27 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX smpeg2-2.0.0-smpeg2-config.patch 776 SHA256 3c07d4670587ac0fbe52b1534e8df12d81fc23ba289e5aeba1e49a0cc3cef040 SHA512 5ac45ffac64d041dd2356ac999044ace6b23ecd149566b6030620e63cd68c0e3346573c4903615674ee5a730e967077dbe27cca5002024366d96af17a61c8c33 WHIRLPOOL 3a8a2e591c1c570c442c23de8082a46d7ed640e61e648a0b057f0d976c7a6c52678d2ebc11f3d17cf23bd34f73ee1ea79c9afcf1b823fa6d63f93aeff401690d
+AUX smpeg2-2.0.0-smpeg2-config.patch 1022 SHA256 c4c6ab11b4c947b83e4e290b440b5b8b214f0a1feceaeae309bc586895f24c2e SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05 WHIRLPOOL 613f32e15450791f84350281e224cff16e9f67a1c926a0e1704344291b64164d24460f16ec921b2ac0989d669f0a44c68405f1068de25069704cdf0c53a410e4
 DIST smpeg-2.0.0.tar.bz2 311846 SHA256 8adcc305a063170ca32983e5e10e216fa4b8106c3947190c0ca561a08ec26512 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950 WHIRLPOOL 23c49525df9bbfc1506c7131fe7b6f6bcd6940d4f1a05cfa3386244fcf949bd11f083568271879f64d0c26c406be5462d2dbacb22e367f542a155c34094797d2
 EBUILD smpeg2-2.0.0-r2.ebuild 1315 SHA256 7cff309d6debbccb086093334bf8f5e756424e3845f508d6274a0d04a7c6202a SHA512 777039d7f1004d5503e66b861cd5b1f810819ac12696730b8a70e89d8e76fb73ad2bf19afef706c3452a7ae563bf82429a286f3e5db484dfc2f3553079d8091e WHIRLPOOL 2d89ab7a21f0068244645ac6ea7e10551e7d1dae63ed6e6e44e67be304023c5ba1792e64712f10f8026112d52a655890df9c82b173250a141bbe15648690b791
-MISC ChangeLog 1058 SHA256 20de83891a3a1ba17d02ca5554664417649dc29e27c9e0d4b92069b8c908c4f3 SHA512 f0d37ba2a3ffe2d89b6707dab84d0fdb583508280ba8c0995ed238342d2aedcc6698ab74eacca035ad1aba53664ad795b1292cc3555d9e0e5525cb3894a693e0 WHIRLPOOL aca94846272bb22b1fa81e664098daedeb0a993b702280ff5eadd75f67a5f56bcb23104c53cf6ba275439a0c37642914c9eb2552d13212dea8b426a000db8c31
+EBUILD smpeg2-2.0.0-r3.ebuild 1355 SHA256 c5236f528d35c07c42ea098fbe09e330bdaa6a3ae54f1cf10be23f098a40d0a2 SHA512 4ee2a9ed9b1975482585b4515d3c5ede1f9af7a168b156d476842a65e42dae6f224e93af999340c6b797278a9f0fdfd50933356c91f1009bd29ca72db416fc15 WHIRLPOOL fdd99ff85fa8eb3aa9108c88412d9aca0e09a27e8124b3774bdd6fab8cee4b06bef02a33381b15833696e9e031348fa2d2d97db117f6a0443cf02635d7cf1af7
+MISC ChangeLog 1300 SHA256 0303c2b4eb48055df7b1646f62d2b65fa74c3ed61e3a31e70cf14136dde57cd0 SHA512 779b93541d1c4df62b748b7657399f8e4193244cc547779f8c2067b06302e77bdc2f7bb883a8c3cf33adc745078011db9f938308fad2e2cf69f189e49b413366 WHIRLPOOL 32fe71bff7cd47e8240c7fb184e58e742841a1ab5a2b76e0f2f11ac4b6482b4659e8c1da533d40c3f3389ebdb4fd63603097c5ac1c60808f77b329d8f92a3d9e
 MISC metadata.xml 159 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69 SHA512 6352e00c52c5aea882fb49482fa13058b44892b9f0d348747a104a92bac4317beebdab189dada073ab9c87fbd9a4d276e725884741fc86bcb6f5b1857c031974 WHIRLPOOL abfa1ff25d21dc915422368c253795602590b470ca5cf3f099bf8675e2684baccac5e3d145391adac1fc5313f2e1d54bf9d8f21704e1b99fe22dec46f3f5acf5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJUynS/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOg4AP/32fjul8svcGhQMEaKvGMYi7
-N9DFiyeuvMvTDefYWBgu1HCxOZZB6+aG11MY1inpgr6Lj+rLPBBfIcRyxlafDmhx
-s183i4Z3ibuYkwnaBDMqv1mmjXZFrDN93x3nC42xAsO5TKGZUtG9pFkErl8joUuW
-j6a/nhs2Bg9PQ8Cp++8zSnv57S9iTKIRYemAbHAUx0D67ec4xVDErKPxMJw/SCtN
-PcWkI6nnkZLbhMC3bJeqBt41Kq4dg/yopKRMh4XaaQ+PfovgY/VOeyuxi50nX7bR
-HWf3aXRa8s5NZ+zx/holKx7uNgLXBG81/dlufFH4SsDncNXF5OVz7MFRVIyHBRfz
-mq12C9seUkgiEBngG8IHZbBAX43DK87mBguCRyoAX8tAWjuZJvX+NLaHSzZ9sgJr
-CgYPCyFsKPVuk/p2IT0O8+Aj9pATAuYOVYs8eiKlfbYd31i9iFUyRuWgcDSoOEYV
-XHSfRQIGogCZGT63Pby603SiOVSVi6IYsVhQ5gZf+MybHTrjEaFhvctVvoE6rdYy
-l9l8MvWzmcdri0pR+K760JgreoUHrhkc3rMkl09/I/AKqhIOrXXzRfYfiRK8WZDs
-Hz+FaH+M12uWATncMid+t7FMDPJWlMTXtegFf6ILthdH+SW2B+e2IB1BVwyTg9BN
-OxbrGqxMgLgu7dZyUQo/
-=AoQy
------END PGP SIGNATURE-----

diff --git a/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch b/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch
index 2018968e195e918edc835e36834c357bbf85a314..66c246f08ccaa68b6404687a863cc095eeaa6b19 100644 (file)
--- a/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch
+++ b/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch
@@ -4,9 +4,14 @@ Subject: fix smpeg2-config.in
 
 SDL_CONFIG is now SDL2_CONFIG in the new sdl2.m4
 
---- smpeg-2.0.0/smpeg2-config.in
+--------------------------------------CUT---------------------------------------
+also
+
+Only dump -L/-rpath if libdir is non-standard; cribbed from smpeg patches
+
+--- smpeg-2.0.0.orig/smpeg2-config.in
 +++ smpeg-2.0.0/smpeg2-config.in
-@@ -42,7 +42,7 @@
+@@ -42,15 +42,17 @@
        if test @includedir@ != /usr/include ; then
          includes=-I@includedir@
        fi
@@ -14,14 +19,15 @@ SDL_CONFIG is now SDL2_CONFIG in the new sdl2.m4
 +      echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags`
        ;;
      --libs)
++      if [ "@libdir@" != "/usr/lib" ]; then
        if [ "`uname`" = "SunOS" ]; then
-@@ -50,7 +50,7 @@
+         libdirs="-L@libdir@ -R@libdir@"
        else
          libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@"
        fi
 -      echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs`
++      fi
 +      echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs`
        ;;
      *)
        echo "${usage}" 1>&2
-

diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
new file mode 100644 (file)
index 0000000..c18bfee
--- /dev/null
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild,v 1.1 2015/02/22 07:51:44 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs autotools multilib-minimal
+
+MY_P=smpeg-${PV}
+DESCRIPTION="SDL MPEG Player Library"
+HOMEPAGE="http://icculus.org/smpeg/"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug cpu_flags_x86_mmx static-libs"
+
+DEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES README README.SDL_mixer TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-smpeg2-config.patch
+
+       # avoid file collision with media-libs/smpeg
+       sed -i \
+               -e '/plaympeg/d' \
+               Makefile.am || die
+
+       mv configure.in configure.ac || die
+       AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+       # the debug option is bogus ... all it does is add extra
+       # optimizations if you pass --disable-debug
+       ECONF_SOURCE="${S}" econf \
+               $(use_enable static-libs static) \
+               --disable-rpath \
+               --enable-debug \
+               --disable-sdltest \
+               $(use_enable cpu_flags_x86_mmx mmx) \
+               $(use_enable debug assertions)
+}
+
+multilib_src_install_all() {
+       use static-libs || prune_libtool_files
+}