summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzamat H. Hackimov <azamat.hackimov@gmail.com>2018-04-21 12:04:45 +0300
committerJames Le Cuirot <chewi@gentoo.org>2018-05-07 22:05:46 +0100
commite993186d745cece33c2085c215cdeb17c30b5696 (patch)
tree2069ffc98383ab1392ec93a5287587681a0fc591
parentx11-libs/fltk: Use pkg-config to find freetype (diff)
downloadgentoo-e993186d745cece33c2085c215cdeb17c30b5696.zip
gentoo-e993186d745cece33c2085c215cdeb17c30b5696.tar.gz
gentoo-e993186d745cece33c2085c215cdeb17c30b5696.tar.bz2
media-libs/libsdl2: Fix to CMake building errors
Generated sdl2.pc contains trailing spaces which considered as error in CMake policy CMP0004. Added patch that fixes that. Upstream bug: https://bugzilla.libsdl.org/show_bug.cgi?id=4144 Bug: https://bugs.gentoo.org/646364 Package-Manager: Portage-2.3.24, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/8098
-rw-r--r--media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch68
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild171
2 files changed, 239 insertions, 0 deletions
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch b/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch
new file mode 100644
index 00000000..9fc43f2
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.8-rework-variables.patch
@@ -0,0 +1,68 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1524545759 25200
+# Node ID 28be2719184c8177899d96b696bcf5e28451266f
+# Parent 2a7839691e3d88c0480c4a855126d5fa03f9ff6a
+Fixed bug 4144 - CMake complains about trailing spaces in sdl2.pc
+
+ Azamat H. Hackimov
+
+When you try use SDL2 2.0.8 in CMake project in Linux, it complains about trailing spaces in sdl2.pc:
+
+CMake Error at CMakeLists.txt:147 (add_executable):
+ Target "TestSimpleMain" links to item "-L/usr/lib64 -lSDL2 " which has
+ leading or trailing whitespace. This is now an error according to policy
+ CMP0004.
+
+diff -r 2a7839691e3d -r 28be2719184c configure
+--- a/configure Mon Apr 23 21:50:03 2018 -0700
++++ b/configure Mon Apr 23 21:55:59 2018 -0700
+@@ -15752,10 +15752,17 @@
+ # fi
+ #done
+ SDL_CFLAGS="$BASE_CFLAGS"
+-SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
+-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
+-LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
++SDL_LIBS="-lSDL2"
++if "$BASE_LDFLAGS" != "" ; then
++ SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
++fi
++if "$EXTRA_CFLAGS" != "" ; then
++ CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
++ CFLAGS="$CFLAGS $EXTRA_CFLAGS"
++fi
++if "$EXTRA_LDFLAGS" != "" ; then
++ LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
++fi
+
+ base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
+
+diff -r 2a7839691e3d -r 28be2719184c configure.in
+--- a/configure.in Mon Apr 23 21:50:03 2018 -0700
++++ b/configure.in Mon Apr 23 21:55:59 2018 -0700
+@@ -123,10 +123,17 @@
+ # fi
+ #done
+ SDL_CFLAGS="$BASE_CFLAGS"
+-SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
+-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
+-LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
++SDL_LIBS="-lSDL2"
++if [ "$BASE_LDFLAGS" != "" ]; then
++ SDL_LIBS="$SDL_LIBS $BASE_LDFLAGS"
++fi
++if [ "$EXTRA_CFLAGS" != "" ]; then
++ CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
++ CFLAGS="$CFLAGS $EXTRA_CFLAGS"
++fi
++if [ "$EXTRA_LDFLAGS" != "" ]; then
++ LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
++fi
+
+ dnl set this to use on systems that use lib64 instead of lib
+ base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
+
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
new file mode 100644
index 00000000..0690eaf
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org"
+SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +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"
+REQUIRED_USE="
+ alsa? ( sound )
+ gles? ( video )
+ nas? ( sound )
+ opengl? ( video )
+ pulseaudio? ( sound )
+ wayland? ( gles )
+ xinerama? ( X )
+ xscreensaver? ( X )"
+
+RDEPEND="
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+ libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+ nas? (
+ >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+ opengl? (
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+ )
+ pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+ tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+ udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
+ >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+ xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+ xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ )"
+DEPEND="${RDEPEND}
+ X? (
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ )
+ virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/SDL2/SDL_config.h
+)
+
+PATCHES=(
+ # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+ "${FILESDIR}"/${PN}-2.0.6-static-libs.patch
+ # https://bugzilla.libsdl.org/show_bug.cgi?id=4144
+ "${FILESDIR}"/${P}-rework-variables.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
+ mv configure.{in,ac} || die
+ AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+ use custom-cflags || strip-flags
+
+ # sorted by `./configure --help`
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ --enable-atomic
+ $(use_enable sound audio)
+ $(use_enable video)
+ --enable-render
+ --enable-events
+ $(use_enable joystick)
+ $(use_enable haptic)
+ --enable-power
+ --enable-filesystem
+ $(use_enable threads)
+ --enable-timers
+ --enable-file
+ $(use_enable kernel_Winnt loadso)
+ --enable-cpuinfo
+ --enable-assembly
+ $(use_enable cpu_flags_x86_sse ssemath)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_3dnow 3dnow)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable altivec)
+ $(use_enable oss)
+ $(use_enable alsa)
+ --disable-alsa-shared
+ --disable-esd
+ $(use_enable pulseaudio)
+ --disable-pulseaudio-shared
+ --disable-arts
+ $(use_enable libsamplerate)
+ $(use_enable nas)
+ --disable-nas-shared
+ --disable-sndio
+ --disable-sndio-shared
+ $(use_enable sound diskaudio)
+ $(use_enable sound dummyaudio)
+ $(use_enable wayland video-wayland)
+ --disable-wayland-shared
+ --disable-video-mir
+ $(use_enable X video-x11)
+ --disable-x11-shared
+ $(use_enable X video-x11-xcursor)
+ $(use_enable X video-x11-xdbe)
+ $(use_enable xinerama video-x11-xinerama)
+ $(use_enable X video-x11-xinput)
+ $(use_enable X video-x11-xrandr)
+ $(use_enable xscreensaver video-x11-scrnsaver)
+ $(use_enable X video-x11-xshape)
+ $(use_enable X video-x11-vm)
+ $(use_enable aqua video-cocoa)
+ --disable-video-directfb
+ --disable-fusionsound
+ --disable-fusionsound-shared
+ $(use_enable video video-dummy)
+ $(use_enable opengl video-opengl)
+ --disable-video-opengles1
+ $(use_enable gles video-opengles2)
+ --disable-video-vulkan
+ $(use_enable udev libudev)
+ $(use_enable dbus)
+ --disable-ibus
+ $(use_enable tslib input-tslib)
+ --disable-directx
+ --disable-rpath
+ --disable-render-d3d
+ $(use_with X x)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ emake V=1
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+ dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
+}