| 1 |
commit: acc8e628fca1259593b9b4bcf97c8a32b9612fab |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 4 02:32:37 2016 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 4 02:33:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc8e628 |
| 7 |
|
| 8 |
media-libs/libsdl2: version bump |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
media-libs/libsdl2/Manifest | 1 + |
| 13 |
.../libsdl2/files/libsdl2-2.0.4-static-libs.patch | 89 ++++++++++++ |
| 14 |
media-libs/libsdl2/libsdl2-2.0.4.ebuild | 153 +++++++++++++++++++++ |
| 15 |
3 files changed, 243 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest |
| 18 |
index 0cc1481..2f64355 100644 |
| 19 |
--- a/media-libs/libsdl2/Manifest |
| 20 |
+++ b/media-libs/libsdl2/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST SDL2-2.0.3.tar.gz 3871267 SHA256 a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c SHA512 b6d2485154fbc07ab86a4305485e116d35fac25a97033b9e1c65ee0eb8251a18209cb1de3a914d9c0ddc53aa1ffac66c865b111d218e79eb5a10ed00dfec7540 WHIRLPOOL d88658953cb668b8d4167b799b4a2e9b90a426fddd0cdddb4914420063e5768c609c2b4a954b50c14cbc5728894646db6bad0e5244ef6a563d4e2ec3da26298b |
| 23 |
+DIST SDL2-2.0.4.tar.gz 4136230 SHA256 da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 WHIRLPOOL 2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574 |
| 24 |
|
| 25 |
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch |
| 26 |
new file mode 100644 |
| 27 |
index 0000000..bee2fd5 |
| 28 |
--- /dev/null |
| 29 |
+++ b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch |
| 30 |
@@ -0,0 +1,89 @@ |
| 31 |
+--- SDL2-2.0.4.orig/configure.in |
| 32 |
++++ SDL2-2.0.4/configure.in |
| 33 |
+@@ -3114,7 +3114,7 @@ |
| 34 |
+ if test -f /lib/w32api/libuuid.a; then |
| 35 |
+ LIBUUID=/lib/w32api/libuuid.a |
| 36 |
+ else |
| 37 |
+- LIBUUID=-luuid |
| 38 |
++ LIBUUID=-Wl,-luuid |
| 39 |
+ fi |
| 40 |
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc" |
| 41 |
+ # The Windows platform requires special setup |
| 42 |
+@@ -3464,23 +3464,23 @@ |
| 43 |
+ |
| 44 |
+ VERSION_OBJECTS=`echo $VERSION_SOURCES` |
| 45 |
+ VERSION_DEPENDS=`echo $VERSION_SOURCES` |
| 46 |
+-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` |
| 47 |
++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` |
| 48 |
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ |
| 49 |
+-\\$(objects)/\\2.o: \\1/\\2.rc\\\\ |
| 50 |
+- \\$(WINDRES) \\$< \\$@,g"` |
| 51 |
++\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ |
| 52 |
++ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` |
| 53 |
+ |
| 54 |
+ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` |
| 55 |
+ SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` |
| 56 |
+-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` |
| 57 |
++SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` |
| 58 |
+ SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ |
| 59 |
+-\\$(objects)/\\2.o: \\1/\\2.c\\\\ |
| 60 |
++\\$(objects)/\\2.lo: \\1/\\2.c\\\\ |
| 61 |
+ \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
| 62 |
+ |
| 63 |
+ SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` |
| 64 |
+ SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` |
| 65 |
+-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` |
| 66 |
++SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` |
| 67 |
+ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ |
| 68 |
+-\\$(objects)/\\2.o: \\1/\\2.c\\\\ |
| 69 |
++\\$(objects)/\\2.lo: \\1/\\2.c\\\\ |
| 70 |
+ \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
| 71 |
+ |
| 72 |
+ # Set runtime shared library paths as needed |
| 73 |
+--- SDL2-2.0.4.orig/Makefile.in |
| 74 |
++++ SDL2-2.0.4/Makefile.in |
| 75 |
+@@ -33,10 +33,10 @@ |
| 76 |
+ OBJECTS = @OBJECTS@ |
| 77 |
+ VERSION_OBJECTS = @VERSION_OBJECTS@ |
| 78 |
+ |
| 79 |
+-SDLMAIN_TARGET = libSDL2main.a |
| 80 |
++SDLMAIN_TARGET = libSDL2main.la |
| 81 |
+ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ |
| 82 |
+ |
| 83 |
+-SDLTEST_TARGET = libSDL2_test.a |
| 84 |
++SDLTEST_TARGET = libSDL2_test.la |
| 85 |
+ SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ |
| 86 |
+ |
| 87 |
+ SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS |
| 88 |
+@@ -138,15 +138,13 @@ |
| 89 |
+ .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) |
| 90 |
+ |
| 91 |
+ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) |
| 92 |
+- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 93 |
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 94 |
+ |
| 95 |
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
| 96 |
+- $(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS) |
| 97 |
+- $(RUN_CMD_RANLIB)$(RANLIB) $@ |
| 98 |
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static |
| 99 |
+ |
| 100 |
+ $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
| 101 |
+- $(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS) |
| 102 |
+- $(RUN_CMD_RANLIB)$(RANLIB) $@ |
| 103 |
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static |
| 104 |
+ |
| 105 |
+ install: all install-bin install-hdrs install-lib install-data |
| 106 |
+ install-bin: |
| 107 |
+@@ -167,10 +165,8 @@ |
| 108 |
+ install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET) |
| 109 |
+ $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) |
| 110 |
+ $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) |
| 111 |
+- $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) |
| 112 |
+- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) |
| 113 |
+- $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) |
| 114 |
+- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) |
| 115 |
++ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) |
| 116 |
++ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) |
| 117 |
+ install-data: |
| 118 |
+ $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal |
| 119 |
+ $(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4 |
| 120 |
|
| 121 |
diff --git a/media-libs/libsdl2/libsdl2-2.0.4.ebuild b/media-libs/libsdl2/libsdl2-2.0.4.ebuild |
| 122 |
new file mode 100644 |
| 123 |
index 0000000..19c1d5c |
| 124 |
--- /dev/null |
| 125 |
+++ b/media-libs/libsdl2/libsdl2-2.0.4.ebuild |
| 126 |
@@ -0,0 +1,153 @@ |
| 127 |
+# Copyright 1999-2015 Gentoo Foundation |
| 128 |
+# Distributed under the terms of the GNU General Public License v2 |
| 129 |
+# $Id$ |
| 130 |
+ |
| 131 |
+# TODO: convert FusionSound #484250 |
| 132 |
+ |
| 133 |
+EAPI=5 |
| 134 |
+inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal |
| 135 |
+ |
| 136 |
+MY_P=SDL2-${PV} |
| 137 |
+DESCRIPTION="Simple Direct Media Layer" |
| 138 |
+HOMEPAGE="http://www.libsdl.org" |
| 139 |
+SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz" |
| 140 |
+ |
| 141 |
+LICENSE="ZLIB" |
| 142 |
+SLOT="0" |
| 143 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86" |
| 144 |
+ |
| 145 |
+IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" |
| 146 |
+REQUIRED_USE=" |
| 147 |
+ alsa? ( sound ) |
| 148 |
+ fusionsound? ( sound ) |
| 149 |
+ gles? ( video ) |
| 150 |
+ nas? ( sound ) |
| 151 |
+ opengl? ( video ) |
| 152 |
+ pulseaudio? ( sound ) |
| 153 |
+ xinerama? ( X ) |
| 154 |
+ xscreensaver? ( X )" |
| 155 |
+ |
| 156 |
+RDEPEND=" |
| 157 |
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) |
| 158 |
+ dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
| 159 |
+ fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) |
| 160 |
+ gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) |
| 161 |
+ nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] ) |
| 162 |
+ opengl? ( |
| 163 |
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
| 164 |
+ >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] |
| 165 |
+ ) |
| 166 |
+ pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) |
| 167 |
+ tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) |
| 168 |
+ udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) |
| 169 |
+ wayland? ( |
| 170 |
+ >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] |
| 171 |
+ >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},wayland] |
| 172 |
+ >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] |
| 173 |
+ ) |
| 174 |
+ X? ( |
| 175 |
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
| 176 |
+ >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] |
| 177 |
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 178 |
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] |
| 179 |
+ >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] |
| 180 |
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
| 181 |
+ >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] |
| 182 |
+ xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) |
| 183 |
+ xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) |
| 184 |
+ )" |
| 185 |
+DEPEND="${RDEPEND} |
| 186 |
+ X? ( |
| 187 |
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] |
| 188 |
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] |
| 189 |
+ ) |
| 190 |
+ virtual/pkgconfig" |
| 191 |
+ |
| 192 |
+S=${WORKDIR}/${MY_P} |
| 193 |
+ |
| 194 |
+src_prepare() { |
| 195 |
+ # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 |
| 196 |
+ epatch "${FILESDIR}"/${P}-static-libs.patch |
| 197 |
+ sed -i -e 's/configure.in/configure.ac/' Makefile.in || die |
| 198 |
+ mv configure.{in,ac} || die |
| 199 |
+ AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf |
| 200 |
+} |
| 201 |
+ |
| 202 |
+multilib_src_configure() { |
| 203 |
+ use custom-cflags || strip-flags |
| 204 |
+ |
| 205 |
+ # sorted by `./configure --help` |
| 206 |
+ ECONF_SOURCE="${S}" econf \ |
| 207 |
+ $(use_enable static-libs static) \ |
| 208 |
+ --enable-atomic \ |
| 209 |
+ $(use_enable sound audio) \ |
| 210 |
+ $(use_enable video) \ |
| 211 |
+ --enable-render \ |
| 212 |
+ --enable-events \ |
| 213 |
+ $(use_enable joystick) \ |
| 214 |
+ $(use_enable haptic) \ |
| 215 |
+ --enable-power \ |
| 216 |
+ --enable-filesystem \ |
| 217 |
+ $(use_enable threads) \ |
| 218 |
+ --enable-timers \ |
| 219 |
+ --enable-file \ |
| 220 |
+ --disable-loadso \ |
| 221 |
+ --enable-cpuinfo \ |
| 222 |
+ --enable-assembly \ |
| 223 |
+ $(use_enable cpu_flags_x86_sse ssemath) \ |
| 224 |
+ $(use_enable cpu_flags_x86_mmx mmx) \ |
| 225 |
+ $(use_enable cpu_flags_x86_3dnow 3dnow) \ |
| 226 |
+ $(use_enable cpu_flags_x86_sse sse) \ |
| 227 |
+ $(use_enable cpu_flags_x86_sse2 sse2) \ |
| 228 |
+ $(use_enable altivec) \ |
| 229 |
+ $(use_enable oss) \ |
| 230 |
+ $(use_enable alsa) \ |
| 231 |
+ --disable-alsa-shared \ |
| 232 |
+ --disable-esd \ |
| 233 |
+ $(use_enable pulseaudio) \ |
| 234 |
+ --disable-pulseaudio-shared \ |
| 235 |
+ --disable-arts \ |
| 236 |
+ $(use_enable nas) \ |
| 237 |
+ --disable-nas-shared \ |
| 238 |
+ --disable-sndio \ |
| 239 |
+ --disable-sndio-shared \ |
| 240 |
+ $(use_enable sound diskaudio) \ |
| 241 |
+ $(use_enable sound dummyaudio) \ |
| 242 |
+ $(use_enable wayland video-wayland) \ |
| 243 |
+ --disable-wayland-shared \ |
| 244 |
+ --disable-video-mir \ |
| 245 |
+ $(use_enable X video-x11) \ |
| 246 |
+ --disable-x11-shared \ |
| 247 |
+ $(use_enable X video-x11-xcursor) \ |
| 248 |
+ $(use_enable X video-x11-xdbe) \ |
| 249 |
+ $(use_enable xinerama video-x11-xinerama) \ |
| 250 |
+ $(use_enable X video-x11-xinput) \ |
| 251 |
+ $(use_enable X video-x11-xrandr) \ |
| 252 |
+ $(use_enable xscreensaver video-x11-scrnsaver) \ |
| 253 |
+ $(use_enable X video-x11-xshape) \ |
| 254 |
+ $(use_enable X video-x11-vm) \ |
| 255 |
+ --disable-video-cocoa \ |
| 256 |
+ --disable-video-directfb \ |
| 257 |
+ $(multilib_native_use_enable fusionsound) \ |
| 258 |
+ --disable-fusionsound-shared \ |
| 259 |
+ $(use_enable video video-dummy) \ |
| 260 |
+ $(use_enable opengl video-opengl) \ |
| 261 |
+ $(use_enable gles video-opengles) \ |
| 262 |
+ $(use_enable udev libudev) \ |
| 263 |
+ $(use_enable dbus) \ |
| 264 |
+ --disable-ibus \ |
| 265 |
+ $(use_enable tslib input-tslib) \ |
| 266 |
+ --disable-directx \ |
| 267 |
+ --disable-rpath \ |
| 268 |
+ --disable-render-d3d \ |
| 269 |
+ $(use_with X x) |
| 270 |
+} |
| 271 |
+ |
| 272 |
+multilib_src_install() { |
| 273 |
+ emake DESTDIR="${D}" install |
| 274 |
+} |
| 275 |
+ |
| 276 |
+multilib_src_install_all() { |
| 277 |
+ prune_libtool_files |
| 278 |
+ dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md |
| 279 |
+} |
Archives