summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2013-08-29 02:19:49 +0200
committereroen2013-08-29 02:19:49 +0200
commit52e83282d94232816be26d041a8968b803f567b3 (patch)
treefa301a81334201f79d2513a336ebc2ff7627046d
parentda3033eea39ed644160def1a44e5e643598beade (diff)
downloaderoen-overlay-52e83282d94232816be26d041a8968b803f567b3.tar.gz
eroen-overlay-52e83282d94232816be26d041a8968b803f567b3.tar.bz2
eroen-overlay-52e83282d94232816be26d041a8968b803f567b3.tar.xz
libsdl2 in gentoo
-rw-r--r--games-engines/openmw/Manifest2
-rw-r--r--games-engines/openmw/openmw-9999.ebuild2
-rw-r--r--media-libs/libsdl/Manifest4
-rw-r--r--media-libs/libsdl/files/libsdl-universal_xdata32_check.patch49
-rw-r--r--media-libs/libsdl/libsdl-2.0.0.ebuild134
-rw-r--r--media-libs/libsdl/metadata.xml37
6 files changed, 2 insertions, 226 deletions
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 788d98f5..ea8e5aaf 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -10,5 +10,5 @@ EBUILD openmw-0.20.0.ebuild 1625 SHA256 9d7f87bb4b0ca560c12f8675b809a491bcd882ae
EBUILD openmw-0.21.0.ebuild 1636 SHA256 cc6ce30804a55794041b0d0460fc1d0d60b1f43f0b21c2ebe3e23fa6e4d8d578 SHA512 a4594120ff820ae7b1e583caa9b5bdaaf6e71d5b15f9cb71c38a61337d67e03e823a5f70378c0f4bf2bfe4684d8fde92aa652f43c73978e30f5850c81d263018 WHIRLPOOL 99df5c25c4700d057d55d0004fa2c410cf0b7fb08575f12a46e2c7b61485868a176d202f56aa2e1523726803855d0b42b651d6de4d509bc2f94ff3ba922f5e5c
EBUILD openmw-0.23.0.ebuild 1598 SHA256 85a0e719d3d6fd84c51b8849d3ea5dd4885119da66b4f6263d9f7f5e520422cd SHA512 f030f181567e8408524d88df1b371eda20877f308cbcbc220656a8e4cd3af8c0a4a040bd4b0903229ca2431647fab800c34cdc47d8a999d50155594e9685b314 WHIRLPOOL 674b5a96af4fcf0354458cdc92bd34559529f3e72cf848bd8c25c5845de1f8ab6d0bb00c4c60d7f580675439af27ac92173f0980738e368f8579776d11f518c9
EBUILD openmw-0.24.0.ebuild 2015 SHA256 7f38b6e2d659069c8842c968cb45d61564366182d56baefd3f0acc6060e045b2 SHA512 c17d0b5c83845d2752d7a01f7ad0a7a4f29e8469d3ab330bbfc483645326f5b14b9002518cfc6b27d62ee1a6caf1ce627a4c45065df9d86d94d167c36271118c WHIRLPOOL 1138405948d839951d0dd6d3e1b05feb708d6e20cbd1e54936fc7486187ebca7a01b214aea30b27e50ff9ddf8ec4d04a2173879b3067012b28e1c6b258517d4d
-EBUILD openmw-9999.ebuild 2203 SHA256 2b9091dbfb80d45d1806dc406f02c0b54d1bf1becfc11241d19b813bdcf5b21f SHA512 aeb872ecbe000592408588982563a8453fd08aa41c4c984aa7635bd51501a170e4ca4b3f7a976849ca5f8cdd132a52a31641eb12b32e07f1ca6d9648f7012c2a WHIRLPOOL cd6e7568da3f4d10e8978c0bf4db8fef249908b07593b60012c1680bfec2974cfba4fdadc317cc26d9dc7bb55ae147836dcc52834ea3174909c6877bc662fd2d
+EBUILD openmw-9999.ebuild 2202 SHA256 ff468439bfb913b2aedf819143fd8b8f4af930c59687660e3ffc5622ec46ce3e SHA512 1d78492bdf2d197750697d8a830a67a131fc13fe39329d1b4c9fc7731352f167f5385678d7128cbf8ccfc944a1a0957dc5520cf15d1a3b69ba8507ce545e4729 WHIRLPOOL d9c9a1fc856bce058973944beaadd60c264827b7e3520f718d04a81052ecaebf7fe1d1420762643af803401021fa63b744581a886518319f83e05af30b453e3a
MISC metadata.xml 437 SHA256 9d686643881da5db3d031edf42d96f2b3c729756c776a3c8dc7fde2638813357 SHA512 c099fe7280c4ab09392648eda8d8a4a293bc54c90c8e244ca6838ba0678d226d68e7393a158d0da01f7fb4eb4831a4e452d2d9474caab82c9c6ac5491cbd2eae WHIRLPOOL c3423ec0cbc278d4adb1b899eeab231dbeb764e9ea05deae3946c790aeb48ab8415179302dd0f068d75572e70bf268eca57a435b74dcc7c3bf20a4660d5f2fc3
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 6332af0d..2f364cb2 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -30,7 +30,7 @@ LIBDEPEND="app-arch/unshield
dev-games/ogre[boost,cg,freeimage,opengl,threads,zip]
dev-games/mygui
dev-libs/boost:=[threads]
- media-libs/libsdl:2
+ media-libs/libsdl2
media-libs/openal
sci-physics/bullet
virtual/ffmpeg
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
deleted file mode 100644
index f9606f6e..00000000
--- a/media-libs/libsdl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libsdl-universal_xdata32_check.patch 2047 SHA256 591c15b4dda2f2a2bcdaceb17db57e5209d5bbc8fb529cbd295f24818dc09bc6 SHA512 d8c0557094bb831ada0bf59aaf7d7782e2ada7bed34e9c70aa19ec0f56e53bab23cab5542b9c66414d69acc9393dcb392148b8d22ec4c098712df3df8018ed7b WHIRLPOOL ecdb4f69217840a00dee550332b0be3dfbc3a7b60c10578a0ce1a370e1b65d391234c8f01f5cbb357bea885f426460429129ee742e1844f79efb5a4999cdce21
-DIST SDL2-2.0.0.tar.gz 3623960 SHA256 6f6ac8153d90e06a118474d5400624ae82b3d3e080915505db27cebc52b27178 SHA512 6650ca1afcf2ad172f511adb80d265722c7533b1e614925ef5bcdce1b898b42c261d6ed8188e15e56bab2002f16d16c255bdd984932e347de6252c0ee54a7f53 WHIRLPOOL 38111cb4f47dda36a658b94f8ab9b50c6009926b45e3d55f255d03e2c0f66040a5b8786d44da51fe572a03eb7fa5ac5d8fa5a0933bbc0579ed0e86de1b2a4c12
-EBUILD libsdl-2.0.0.ebuild 4208 SHA256 e7c8cd19f273b6ee0ce8dc25b46ec7d92869b342fe14547d5fb249b31b4c83ae SHA512 32437a45420a3c5a7baaef914f6624307e3a9a9b08db5bde707ab088ef1ac68c12a82aff9cfed1ff81e976ed51cbf85af050eb4d4ea651b7cbb83ac4fb31e2b8 WHIRLPOOL 472d194e6bf92c36bd5989efbea9c22af1745a2f9741127a79655704ad75b820a3619445a310eaa776dbcbf9fc4bb4f74aaa380c12c64695c291e937d0cc3167
-MISC metadata.xml 1748 SHA256 e5cb522593b21398c5ee78e508aedc2c9c6b9ae2972bf112ac2ddc536e4d4c73 SHA512 7307321b5d3c3198a7e6111eaa4235e3caa03e15cd065b12cd75312a4da95e4cef6294ca9a717c48da8fc505cc65df128aff92390b204e19cb33bf7751a3a8c9 WHIRLPOOL 3a493729bb5ea3400ea80e4697f655047a0d5a46fa03dd40cf79be7df09eaff56901da1d041a57e30cc3a4dccca8f95a3fc2fa8e1fb8ee81a84ebf69e55e709d
diff --git a/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch b/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch
deleted file mode 100644
index d7410256..00000000
--- a/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-# HG changeset patch
-# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
-# Date 1370413935 -21600
-# Node ID 00d5ada80b60f6e163a2ebbb5949515dd9646458
-# Parent 2a858d938e21eb4f6f4496f29557a1fa14b566b4
-Make _XData32 checking universal for 32 and 64 architectures.
-_XData32 is used only for 64, so there should be no regression in 32bit
-enviroment.
-This commit intended for making universal SDL_config.h in mixed 32/64
-enviroment.
-
-diff -r 2a858d938e21 -r 00d5ada80b60 cmake/sdlchecks.cmake
---- a/cmake/sdlchecks.cmake Wed Jun 05 12:28:53 2013 +0600
-+++ b/cmake/sdlchecks.cmake Wed Jun 05 12:32:15 2013 +0600
-@@ -357,6 +357,7 @@
- endif(HAVE_XGENERICEVENT)
-
- check_c_source_compiles("
-+ #define LONG64
- #include <X11/Xlibint.h>
- extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
- int main(int argc, char **argv) {}" HAVE_CONST_XDATA32)
-diff -r 2a858d938e21 -r 00d5ada80b60 configure.in
---- a/configure.in Wed Jun 05 12:28:53 2013 +0600
-+++ b/configure.in Wed Jun 05 12:32:15 2013 +0600
-@@ -1147,14 +1147,15 @@
- AC_MSG_CHECKING(for const parameter to _XData32)
- have_const_param_xdata32=no
- AC_TRY_COMPILE([
-- #include <X11/Xlibint.h>
-- extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
-- ],[
-- ],[
-- have_const_param_xdata32=yes
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
-- ])
-- AC_MSG_RESULT($have_const_param_xdata32)
-+ #define LONG64
-+ #include <X11/Xlibint.h>
-+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
-+ ],[
-+ ],[
-+ have_const_param_xdata32=yes
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
-+ ])
-+ AC_MSG_RESULT($have_const_param_xdata32)
-
- dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
- AC_MSG_CHECKING([for XGenericEvent])
diff --git a/media-libs/libsdl/libsdl-2.0.0.ebuild b/media-libs/libsdl/libsdl-2.0.0.ebuild
deleted file mode 100644
index 61e76d21..00000000
--- a/media-libs/libsdl/libsdl-2.0.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-multilib eutils
-
-MY_PV=${PV/_pre/-}
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="http://www.libsdl.org/release/SDL2-${MY_PV}.tar.gz"
-LICENSE="ZLIB"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X xinerama xscreensaver"
-
-#FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage.
-#FIXME: media-libs/nas no have emul-* ebuild
-#FIXME: virtual/opengl for abi_x86_32 require additional handling
-RDEPEND="
- nas? (
- media-libs/nas
- ( || ( app-emulation/emul-linux-x86-xlibs
- ( x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXt[${MULTILIB_USEDEP}] )
- ) )
- )
- X? ( || ( app-emulation/emul-linux-x86-xlibs
- ( x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXt[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}] )
- )
- )
- xinerama? ( || (
- app-emulation/emul-linux-x86-xlibs
- x11-libs/libXinerama[${MULTILIB_USEDEP}] ) )
- xscreensaver? ( || (
- app-emulation/emul-linux-x86-xlibs
- x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] ) )
- alsa? ( || (
- app-emulation/emul-linux-x86-soundlibs
- media-libs/alsa-lib[${MULTILIB_USEDEP}] ) )
- fusionsound? ( >=media-libs/FusionSound-1.1.1 )
- pulseaudio? (
- amd64? ( app-emulation/emul-linux-x86-soundlibs )
- x86? ( media-sound/pulseaudio )
- )
- gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) )
- opengl? ( virtual/opengl )
- tslib? ( x11-libs/tslib )
-"
-
-DEPEND="${RDEPEND}
- nas? (
- ( || ( app-emulation/emul-linux-x86-xlibs
- ( x11-proto/xextproto[${MULTILIB_USEDEP}]
- x11-proto/xproto[${MULTILIB_USEDEP}] )
- ) )
- )
- X? (
- ( || ( app-emulation/emul-linux-x86-xlibs
- ( x11-proto/inputproto[${MULTILIB_USEDEP}]
- x11-proto/xextproto[${MULTILIB_USEDEP}]
- x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
- x11-proto/xproto[${MULTILIB_USEDEP}]
- x11-proto/randrproto[${MULTILIB_USEDEP}]
- x11-proto/renderproto[${MULTILIB_USEDEP}] )
- ) )
- )
- xinerama? ( || ( app-emulation/emul-linux-x86-xlibs
- x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) )
- xscreensaver? ( || ( app-emulation/emul-linux-x86-xlibs
- x11-proto/scrnsaverproto[${MULTILIB_USEDEP}] ) )
-"
-
-S=${WORKDIR}/SDL2-${MY_PV}
-
-DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt )
-
-src_prepare() {
- # Make headers more universal for 32/64 archs.
- # See http://bugzilla.libsdl.org/show_bug.cgi?id=1893
- epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch"
-
- epatch_user
-}
-
-src_configure() {
- mycmakeargs=(
- # Disable assertion tests.
- -DASSERTIONS=disabled
- # Avoid hard-coding RPATH entries into dynamically linked SDL libraries.
- -DRPATH=NO
- # Disable obsolete and/or inapplicable libraries.
- -DARTS=NO
- -DESD=NO
- $(cmake-utils_use 3dnow 3DNOW)
- $(cmake-utils_use alsa ALSA)
- $(cmake-utils_use altivec ALTIVEC)
- $(cmake-utils_use asm ASSEMBLY)
- $(cmake-utils_use aqua VIDEO_COCOA)
- $(cmake-utils_use fusionsound FUSIONSOUND)
- $(cmake-utils_use gles VIDEO_OPENGLES)
- $(cmake-utils_use mmx MMX)
- $(cmake-utils_use nas NAS)
- $(cmake-utils_use opengl VIDEO_OPENGL)
- $(cmake-utils_use oss OSS)
- $(cmake-utils_use pulseaudio PULSEAUDIO)
- $(cmake-utils_use threads PTHREADS)
- $(cmake-utils_use sse SSE)
- $(cmake-utils_use sse SSEMATH)
- $(cmake-utils_use sse2 SSE2)
- $(cmake-utils_use static-libs SDL_STATIC)
- $(cmake-utils_use tslib INPUT_TSLIB)
- $(cmake-utils_use video VIDEO_DUMMY)
- $(cmake-utils_use X VIDEO_X11)
- $(cmake-utils_use X VIDEO_X11_XCURSOR)
- $(cmake-utils_use xinerama VIDEO_X11_XINERAMA)
- $(cmake-utils_use X VIDEO_X11_XINPUT)
- $(cmake-utils_use X VIDEO_X11_XRANDR)
- $(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER)
- $(cmake-utils_use X VIDEO_X11_XVM)
- #$(cmake-utils_use joystick SDL_JOYSTICK)
- )
- cmake-multilib_src_configure
-}
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
deleted file mode 100644
index 6a3aa9f7..00000000
--- a/media-libs/libsdl/metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>azamat.hackimov@gmail.com</email>
- <name>Azamat H. Hackimov</name>
- </maintainer>
- <longdescription>
-Simple DirectMedia Layer is a cross-platform multimedia library designed
-to provide low level access to audio, keyboard, mouse, joystick, 3D
-hardware via OpenGL, and 2D video framebuffer. It is used by MPEG
-playback software, emulators, and many popular games, including the
-award winning Linux port of "Civilization: Call To Power."
-
-SDL supports Linux, Windows, Windows CE, BeOS, MacOS, MacOS X, FreeBSD,
-NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. The code also contains
-support for AmigaOS, Dreamcast, Atari, AIX, OSF/Tru64, RISC OS,
-SymbianOS, and OS/2, but these are not officially supported.
-
-SDL is written in C, but works with C++ natively, and has bindings to
-several other languages, including Ada, C#, D, Eiffel, Erlang, Euphoria,
-Go, Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
-Pike, Pliant, Python, Ruby, Smalltalk, and Tcl.
-</longdescription>
- <upstream>
- <doc lang="en">http://www.libsdl.org/cgi/docwiki.cgi</doc>
- <bugs-to>http://bugzilla.libsdl.org</bugs-to>
- </upstream>
- <use>
- <!--flag name="directx">Adds support for Windows DirectX audio and video</flag-->
- <flag name="asm">Enable assembly for optimization (3dnow, mmx, sse, sse2)</flag>
- <flag name="fusionsound">Enable FusionSound audio support</flag>
- <flag name="gles">Enable OpenGL ES video support</flag>
- <flag name="tslib">Enable tslib-based touchscreen device support</flag>
- <flag name="video">Control video support (disable at your own risk)</flag>
- </use>
-</pkgmetadata>