SDL2: fix previous (set vars not appending to them).

This commit is contained in:
Juan RP 2015-03-20 16:40:12 +01:00
parent 77f7de4d43
commit 42bb17104f
1 changed files with 6 additions and 6 deletions

View File

@ -1,7 +1,7 @@
# Template file for 'SDL2' # Template file for 'SDL2'
pkgname=SDL2 pkgname=SDL2
version=2.0.3 version=2.0.3
revision=4 revision=5
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
--enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared
@ -20,17 +20,15 @@ build_options="gles opengl pulseaudio wayland x11"
if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
# Enable OpenGL, pulseaudio and x11 # Enable OpenGL, pulseaudio and x11
build_options_default+=" opengl pulseaudio x11" build_options_default="opengl pulseaudio x11"
elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
# Enable OpenGL/ES on rpi platforms # Enable OpenGL/ES on rpi platforms
build_options_default+=" gles" build_options_default="gles"
fi fi
if [ "$build_option_gles" ]; then if [ "$build_option_gles" ]; then
# libGLESv2.so.1 is dynamically loaded with dlopen.
depends+=" libGLES>=1.0"
configure_args+=" --enable-video-opengles" configure_args+=" --enable-video-opengles"
if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
# RaspberryPi, use Videocore IV # RaspberryPi, use Videocore IV
@ -38,8 +36,10 @@ if [ "$build_option_gles" ]; then
CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads" CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib" LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib"
else else
# libGLESv2.so.1 is dynamically loaded with dlopen.
shlib_requires="libGLESv2.so.1" shlib_requires="libGLESv2.so.1"
makedepends+=" glu-devel" makedepends+=" glu-devel"
depends="libGLES"
fi fi
else else
configure_args+=" --disable-video-opengles" configure_args+=" --disable-video-opengles"
@ -48,7 +48,7 @@ fi
if [ "$build_option_opengl" ]; then if [ "$build_option_opengl" ]; then
# libGL.so.1 is dynamically loaded with dlopen. # libGL.so.1 is dynamically loaded with dlopen.
shlib_requires="libGL.so.1" shlib_requires="libGL.so.1"
depends+=" libGL" depends="libGL"
configure_args+=" --enable-video-opengl" configure_args+=" --enable-video-opengl"
makedepends+=" glu-devel" makedepends+=" glu-devel"
else else