diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-10-07 15:36:17 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-10-07 15:36:17 +0000 |
| commit | 15237c9d114c6f805fb48a541687cba653ffbc3a (patch) | |
| tree | 918ea5dbc23542c52e2a3c216345c74b03943a5f /media-libs | |
| parent | Version bump. (diff) | |
| download | historical-15237c9d114c6f805fb48a541687cba653ffbc3a.tar.gz historical-15237c9d114c6f805fb48a541687cba653ffbc3a.tar.bz2 historical-15237c9d114c6f805fb48a541687cba653ffbc3a.zip | |
fix smpeg2-config
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/smpeg2/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/smpeg2/Manifest | 19 | ||||
| -rw-r--r-- | media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch | 27 | ||||
| -rw-r--r-- | media-libs/smpeg2/smpeg2-2.0.0-r1.ebuild (renamed from media-libs/smpeg2/smpeg2-2.0.0.ebuild) | 4 |
4 files changed, 47 insertions, 11 deletions
diff --git a/media-libs/smpeg2/ChangeLog b/media-libs/smpeg2/ChangeLog index 21a368e85b77..98d340030dd8 100644 --- a/media-libs/smpeg2/ChangeLog +++ b/media-libs/smpeg2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/smpeg2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg2/ChangeLog,v 1.1 2013/08/28 21:42:16 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg2/ChangeLog,v 1.2 2013/10/07 15:36:12 hasufell Exp $ + +*smpeg2-2.0.0-r1 (07 Oct 2013) + + 07 Oct 2013; Julian Ospald <hasufell@gentoo.org> -smpeg2-2.0.0.ebuild, + +smpeg2-2.0.0-r1.ebuild, +files/smpeg2-2.0.0-smpeg2-config.patch: + fix smpeg2-config *smpeg2-2.0.0 (28 Aug 2013) diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest index ab7a68f63450..55cae85b2868 100644 --- a/media-libs/smpeg2/Manifest +++ b/media-libs/smpeg2/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX smpeg2-2.0.0-smpeg2-config.patch 776 SHA256 3c07d4670587ac0fbe52b1534e8df12d81fc23ba289e5aeba1e49a0cc3cef040 SHA512 5ac45ffac64d041dd2356ac999044ace6b23ecd149566b6030620e63cd68c0e3346573c4903615674ee5a730e967077dbe27cca5002024366d96af17a61c8c33 WHIRLPOOL 3a8a2e591c1c570c442c23de8082a46d7ed640e61e648a0b057f0d976c7a6c52678d2ebc11f3d17cf23bd34f73ee1ea79c9afcf1b823fa6d63f93aeff401690d DIST smpeg-2.0.0.tar.bz2 311846 SHA256 8adcc305a063170ca32983e5e10e216fa4b8106c3947190c0ca561a08ec26512 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950 WHIRLPOOL 23c49525df9bbfc1506c7131fe7b6f6bcd6940d4f1a05cfa3386244fcf949bd11f083568271879f64d0c26c406be5462d2dbacb22e367f542a155c34094797d2 -EBUILD smpeg2-2.0.0.ebuild 1182 SHA256 371db9ccc89be7f50322cb5113ecbfbfdc119044a1a4d6bdb66c44a577e5fbfe SHA512 31d223baefa56aaf454b06f5c73dfe679afda946369719864715516765be8cc9c9a0dfd92ca38e7d77d163f70196e46f20b81d758f13fd56bbb90858b2a28ea8 WHIRLPOOL 9ad2b59daba2aa8fb4762e9adacadd0ac72004c1d1df9e197c6771e9071d38c645796d15f66b87da1e541a32ec5867d2b4d93c90a5ad5aad6412c9084130345b -MISC ChangeLog 358 SHA256 bf44874850203730f3d89cdd78b51c85391a39e0d0bac5cc8ef9543906b2dc92 SHA512 423d4a3eb6a824dca6a3b9d3e18d45263b9e904d69c395f8fc9bef5f0b71a44cfda6c3316a651bab9707295fcccba3d80fdec46ac432639d20a9573c4a2337cf WHIRLPOOL ced06bc32a898671ec504c800286b6b18d38150b4ef883f7ef4cc8c4e12574ad3fb57ae5396a492225e29f0020186ea0766fe37dee57078564068010417d35a7 +EBUILD smpeg2-2.0.0-r1.ebuild 1233 SHA256 43d85dd3fec184d960927f870d6af2ef565b13d9b34c83631b28cd3131e42eef SHA512 f981d14782ba9a1289f6852d28295a07c4c5c98705108e9c8804f2772a15decc3ebfccb3a3ecb8ae17ffdd9098f21fbd109dac5ee6e2411da8274bc09553f127 WHIRLPOOL 5b005bb2ad2f2976a88f2512f2454cda5364ea06b34714d47c147b915822ce225e4d00d3624ec48891daaff1e396b450f093bd6f9a1a1eea8c5adc9b64785bc7 +MISC ChangeLog 552 SHA256 e40ef08f34e90a883dbffb70c2a3106742d6cb9ea943137a7bc911efe49455ca SHA512 3768f1a28b9d7c182d3748b8505d39f2a2794a78cf323b9cc6789500c3af021c28616d7dc1c62eaa3fbcd3f42f5447bf5cb342ed04ee4165436127e1514e9a16 WHIRLPOOL 2cb0eb344fba295b8059bcc2faae1fa9227e51397965af9cbe1240022b66b9e1c9cdb541bb23b5121c910e66a8b2d3f8566d57102ab0517cb21d83b49994b375 MISC metadata.xml 159 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69 SHA512 6352e00c52c5aea882fb49482fa13058b44892b9f0d348747a104a92bac4317beebdab189dada073ab9c87fbd9a4d276e725884741fc86bcb6f5b1857c031974 WHIRLPOOL abfa1ff25d21dc915422368c253795602590b470ca5cf3f099bf8675e2684baccac5e3d145391adac1fc5313f2e1d54bf9d8f21704e1b99fe22dec46f3f5acf5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJSHm66AAoJEFpvPKfnPDWzSGcIALMI0WA/pIQZ9S0LUq4guWVY -h5OnS1wIMVa6J1I6EklTYIsgWEWhvU1DuqONIp60TbIGRA/bI5/WoL7tr/kT8knU -U1fw3doY2fwqGD0MqiV52xVw/RfPsE8LPN8bArhRUh9cHEj3mqtAOCjSJM7X8hHg -+/6mI2RKPsjLC+5h6F0tkYZW33aX/wkM/puvYfRPJA/cqhXqBsq0CqsEX6eaNV6Y -r+D4jKle90VrnZcOdJRxTWBmlI2qJQYVbvPDQmqwoReGFdl2VfDadtC+JHtMzJkJ -NDUjdRWwzxNuMNL1D+cDIH0UuvV3feFf2e2vuQt8mhCAm/VpkFc3zt1bNGFvvWo= -=XAF8 +iQEcBAEBCAAGBQJSUtTyAAoJEFpvPKfnPDWzZAEH/01vx/xFL0NPzHpXf2vFHf/8 +EmLThRqmkmT9h5wGopfm6/gFS0l6HiZIF5d3EFJjrUUjTvpGFWkfU7hfvmnrhTFM +FWQbFDsuEm4yvns3PTPyzmzcWUJvfeyyRYVibznkn8mJCPXVDCHxxAm0rOdQmiUT +6DCjRMeLYpvWZYKIDub8t0EU83BQvPMgJxH+nVS2XjvQ2FPs0foWA9x1TYtCxMYF +Og0r1X1juMeSW9sRw7E6fTrqnzKPpN9TaajRcfzy834B/QnUhrkwO3M2PS5rlF+y +2NMBm0aabcmvx5Rug5kTDsEKqDpO2EauHlPDtlLLgrw5cBxCJ7vfTki40php4B8= +=urE7 -----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 new file mode 100644 index 000000000000..2018968e195e --- /dev/null +++ b/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch @@ -0,0 +1,27 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Mon Oct 7 15:10:46 UTC 2013 +Subject: fix smpeg2-config.in + +SDL_CONFIG is now SDL2_CONFIG in the new sdl2.m4 + +--- smpeg-2.0.0/smpeg2-config.in ++++ smpeg-2.0.0/smpeg2-config.in +@@ -42,7 +42,7 @@ + if test @includedir@ != /usr/include ; then + includes=-I@includedir@ + fi +- echo $includes -I@includedir@/smpeg2 `@SDL_CONFIG@ --cflags` ++ echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags` + ;; + --libs) + if [ "`uname`" = "SunOS" ]; then +@@ -50,7 +50,7 @@ + else + libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@" + fi +- echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs` ++ echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs` + ;; + *) + echo "${usage}" 1>&2 + diff --git a/media-libs/smpeg2/smpeg2-2.0.0.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r1.ebuild index 436145ea089b..b12a1349abf7 100644 --- a/media-libs/smpeg2/smpeg2-2.0.0.ebuild +++ b/media-libs/smpeg2/smpeg2-2.0.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.ebuild,v 1.1 2013/08/28 21:42:16 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg2/smpeg2-2.0.0-r1.ebuild,v 1.1 2013/10/07 15:36:12 hasufell Exp $ EAPI=5 inherit eutils toolchain-funcs autotools @@ -23,6 +23,8 @@ 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' \ |