reinit the tree, so we can have metadata

5 files changed, 123 insertions, 0 deletions

diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
new file mode 100644
index 000000000000..ecf780032de0
--- /dev/null
+++ b/media-libs/smpeg2/Manifest
@@ -0,0 +1,7 @@
+AUX smpeg2-2.0.0-gcc6.patch 857 SHA256 762b1bb0ff1ab75b977610cdabe4cd0d47be7349c3a42581405d26cc0758c857 SHA512 506a9aa8714927466dcef913d566b1acdd705e3eb8bb8d4e8bfe103428af9a7fc16e71a79ff126328c36a76c6cd2fd727804f5de1c3ae00bd0a7a82aa3a1dfc7 WHIRLPOOL ef4dd27c2c40f26eca94c68df23708291d407112dd37f19bb60ac13cfdbdb91e67f399f6ffcb464f0f84b6bac1a7fe2ff0180ec7062b2d5a567e5fcf73fba4ce
+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-r3.ebuild 1288 SHA256 cc105165aff32a51399a5a650a5b148f5f05d40b27c00cf066a5c137a0948e38 SHA512 e57e32d74309ac5c9317adb4aec661cedd207e73bf1ec5d62df1c27e83bd659750f0756486e6a7ab1daf2e5deb89ec8ab9171a68c1d01177b21052bb4d9b0ab5 WHIRLPOOL 09fe720dd6dd5ffb734f5b911bc68030c611832bad4c82d05061d4fdb008a01d8cb25ffe5fc3b651b6f6a8c106616b92b2236db670e3334624aa434f522b5d6f
+MISC ChangeLog 2501 SHA256 ec4e3197154dda78f2dcdabf181a914610e75777893a0dd8abc67f35827e8f42 SHA512 864fb34635c5841b64e53fb00f31d7c71d6ac71cd833fcc553dba3521736d54757e94e5cf37922c4b4b443dd8525bc57afaf04c5bd5d1785c3173ad95023f59b WHIRLPOOL 502e7d879b8764449381b9c224967f254870d77a2a5f3f670b5af6676644eb3eea697fcd7fc09a03c746c482332c892c1c7e7027a94b32e56dbf6590e1156956
+MISC ChangeLog-2015 1592 SHA256 92e3730490f34eca77432842287e7e71b21d36021038a32fc4460e41ebbeeac9 SHA512 dc6ccf9b2f5878fc0dd4c2f53e252c004863b466782b71c4d5a948345d9523e4ae08b1a533b71191cfeebe7fdc89e7bec077f675b75d93b15eb7469b422a484d WHIRLPOOL e04e8cf3b17822a5773f900ad0b8b6c77287c04b6b59ca3d7eebcdd5a73dbdf58be4806453f0871a2478d41cf310437ca24628c14e72a8461bb7853b82aa8571
+MISC metadata.xml 253 SHA256 2c95b2eb99144a3b66de17be35eebcf65e5a152a2ec2f176165bb9cd78e5394e SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254 WHIRLPOOL fd044f0a960e57257f4a15ab16f066bbfe9983e60cd5fc072e631efc7027306c612a01d7fbbf57eb08d957487a7ce1961250194653d6ed87ee23f20d631ef854
diff --git a/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
new file mode 100644
index 000000000000..4094c61ba432
--- /dev/null
+++ b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
@@ -0,0 +1,23 @@
+gcc-6 is more strict WRT narrowing:
+error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ inside { } [-Wnarrowing]
+
+https://bugs.gentoo.org/594912
+diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp
+index 6bc8e86..5414ae3 100644
+--- a/audio/hufftable.cpp
++++ b/audio/hufftable.cpp
+@@ -552,3 +552,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, ~0u, ~0u, 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+@@ -556,3 +556,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, ~0u, ~0u, 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+@@ -566,3 +566,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14,~0u,  ~0u, 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
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..66c246f08cca
--- /dev/null
+++ b/media-libs/smpeg2/files/smpeg2-2.0.0-smpeg2-config.patch
@@ -0,0 +1,33 @@
+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
+
+--------------------------------------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,15 +42,17 @@
+       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 [ "@libdir@" != "/usr/lib" ]; then
+       if [ "`uname`" = "SunOS" ]; then
+         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/metadata.xml b/media-libs/smpeg2/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/media-libs/smpeg2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
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
index 000000000000..ed6616eae337
--- /dev/null
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs autotools multilib-minimal
+
+MY_P=smpeg-${PV}
+DESCRIPTION="SDL MPEG Player Library"
+HOMEPAGE="https://icculus.org/smpeg/"
+SRC_URI="https://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
+	epatch "${FILESDIR}"/${P}-gcc6.patch
+	epatch_user
+
+	# 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
+}