From 77f7de4d434dd7b818c086566b4820f57093eaff Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 20 Mar 2015 16:30:40 +0100 Subject: [PATCH] SDL2: only enable gles on armv6 for now and fix shlib_requires. Close #1082 --- srcpkgs/SDL2/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index 2706e08fcd..95048b2e1f 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,7 +1,7 @@ # Template file for 'SDL2' pkgname=SDL2 version=2.0.3 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared @@ -22,15 +22,14 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; the # Enable OpenGL, pulseaudio and x11 build_options_default+=" opengl pulseaudio x11" -elif [ "$XBPS_TARGET_MACHINE" = "armv6l" -o "$XBPS_TARGET_MACHINE" = "armv7l" ]; then - # Enable OpenGL/ES on ARM platforms +elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then + # Enable OpenGL/ES on rpi platforms build_options_default+=" gles" fi if [ "$build_option_gles" ]; then # libGLESv2.so.1 is dynamically loaded with dlopen. - shlib_requires="libGLESv2.so.1" depends+=" libGLES>=1.0" configure_args+=" --enable-video-opengles" if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then @@ -39,6 +38,7 @@ if [ "$build_option_gles" ]; then 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" else + shlib_requires="libGLESv2.so.1" makedepends+=" glu-devel" fi else