From 0511b87ff3463c5416e7f435a987c2505928d5c4 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 27 May 2019 00:22:07 +0300 Subject: [PATCH] new package: freeglut Requested in https://github.com/termux/x11-packages/issues/78. --- x11-packages/freeglut/CMakeLists.txt.patch | 97 +++++++++++++++++++ x11-packages/freeglut/build.sh | 9 ++ x11-packages/freeglut/src-fg_internal.h.patch | 18 ++++ 3 files changed, 124 insertions(+) create mode 100644 x11-packages/freeglut/CMakeLists.txt.patch create mode 100644 x11-packages/freeglut/build.sh create mode 100644 x11-packages/freeglut/src-fg_internal.h.patch diff --git a/x11-packages/freeglut/CMakeLists.txt.patch b/x11-packages/freeglut/CMakeLists.txt.patch new file mode 100644 index 000000000..aa88d5f87 --- /dev/null +++ b/x11-packages/freeglut/CMakeLists.txt.patch @@ -0,0 +1,97 @@ +diff -uNr freeglut-3.0.0/CMakeLists.txt freeglut-3.0.0.mod/CMakeLists.txt +--- freeglut-3.0.0/CMakeLists.txt 2015-02-18 06:59:57.000000000 +0200 ++++ freeglut-3.0.0.mod/CMakeLists.txt 2019-05-26 23:09:11.933353781 +0300 +@@ -131,42 +131,6 @@ + ) + ENDIF() + +-ELSEIF(ANDROID OR BLACKBERRY) +- # BlackBerry and Android share some similar design concepts and ideas, as with many mobile devices. +- # As such, some classes can be shared between the two. XXX: Possibly rename shareable classes to +- # a more generic name. *_stub? *_mobile? +- LIST(APPEND FREEGLUT_SRCS +- src/android/fg_cursor_android.c +- src/android/fg_ext_android.c +- src/android/fg_gamemode_android.c +- src/android/fg_joystick_android.c +- src/android/fg_spaceball_android.c +- ) +- IF(ANDROID) +- LIST(APPEND FREEGLUT_SRCS +- src/android/native_app_glue/android_native_app_glue.c +- src/android/native_app_glue/android_native_app_glue.h +- src/android/fg_internal_android.h +- src/android/fg_init_android.c +- src/android/fg_input_devices_android.c +- src/android/fg_main_android.c +- src/android/fg_main_android.h +- src/android/fg_runtime_android.c +- src/android/fg_state_android.c +- src/android/fg_structure_android.c +- src/android/fg_window_android.c +- ) +- ELSE() +- LIST(APPEND FREEGLUT_SRCS +- src/blackberry/fg_internal_blackberry.h +- src/blackberry/fg_init_blackberry.c +- src/x11/fg_input_devices_x11.c +- src/blackberry/fg_main_blackberry.c +- src/blackberry/fg_state_blackberry.c +- src/blackberry/fg_structure_blackberry.c +- src/blackberry/fg_window_blackberry.c +- ) +- ENDIF() + ELSE() + LIST(APPEND FREEGLUT_SRCS + src/x11/fg_cursor_x11.c +@@ -255,7 +219,7 @@ + ENDIF(CMAKE_COMPILER_IS_GNUCC) + + INCLUDE(CheckIncludeFiles) +-IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) ++IF(UNIX AND NOT(BLACKBERRY)) + FIND_PACKAGE(X11 REQUIRED) + INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR}) + LIST(APPEND LIBS ${X11_LIBRARIES}) +@@ -273,11 +237,7 @@ + LIST(APPEND LIBS ${X11_Xinput_LIB}) + ENDIF() + ENDIF() +-IF(ANDROID) +- # -landroid for ANativeWindow +- # -llog for native Android logging +- LIST(APPEND LIBS android log) +-ELSEIF(BLACKBERRY) ++IF(BLACKBERRY) + # -lbps for event loop + # -screen for native screen + LIST(APPEND LIBS bps screen) +@@ -391,17 +351,6 @@ + IF(FREEGLUT_BUILD_STATIC_LIBS) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME}) + ENDIF() +- IF(ANDROID) +- # Not in CMake toolchain file, because the toolchain +- # file is called several times and generally doesn't +- # seem to be meant for modifying CFLAGS: +- # '-mandroid' is not mandatory but doesn't hurt +- # '-O0 -gstabs+' helps the currently buggy GDB port +- # Too late to manipulate ENV: SET(ENV{CFLAGS} "$ENV{CFLAGS} -mandroid") +- # Not using _INIT variables, they seem to be used internally only +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid") +- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+") +- ENDIF() + ENDIF() + IF(FREEGLUT_BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(freeglut ${LIBS}) +@@ -498,9 +447,7 @@ + IF(WIN32) + SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32 -lm") + ELSEIF(FREEGLUT_GLES) +- IF(ANDROID) +- SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lGLESv1_CM -lEGL -lm") +- ELSEIF(BLACKBERRY) ++ IF(BLACKBERRY) + IF(PLAYBOOK) + SET(PC_LIBS_PRIVATE "-lbps -lscreen -lGLESv2 -lGLESv1_CM -lEGL -lm") + ELSE() diff --git a/x11-packages/freeglut/build.sh b/x11-packages/freeglut/build.sh new file mode 100644 index 000000000..67bb5da7e --- /dev/null +++ b/x11-packages/freeglut/build.sh @@ -0,0 +1,9 @@ +TERMUX_PKG_HOMEPAGE=http://freeglut.sourceforge.net/ +TERMUX_PKG_DESCRIPTION="Provides functionality for small OpenGL programs" +TERMUX_PKG_LICENSE="MIT" +TERMUX_PKG_MAINTAINER="Leonid Plyushch " +TERMUX_PKG_VERSION=3.0.0 +TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/freeglut/freeglut-$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SHA256=2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2 +TERMUX_PKG_DEPENDS="glu, libxi, libxrandr, mesa" +TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/freeglut/src-fg_internal.h.patch b/x11-packages/freeglut/src-fg_internal.h.patch new file mode 100644 index 000000000..4232115af --- /dev/null +++ b/x11-packages/freeglut/src-fg_internal.h.patch @@ -0,0 +1,18 @@ +diff -uNr freeglut-3.0.0/src/fg_internal.h freeglut-3.0.0.mod/src/fg_internal.h +--- freeglut-3.0.0/src/fg_internal.h 2014-12-22 18:27:02.000000000 +0200 ++++ freeglut-3.0.0.mod/src/fg_internal.h 2019-05-26 23:10:09.214765925 +0300 +@@ -44,13 +44,10 @@ + || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) ) + # define TARGET_HOST_MS_WINDOWS 1 + +-#elif defined (__ANDROID__) +-# define TARGET_HOST_ANDROID 1 +- + #elif defined (__QNXNTO__) || defined (__PLAYBOOK__) + # define TARGET_HOST_BLACKBERRY 1 + +-#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) ++#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) || defined(__ANDROID__) + # define TARGET_HOST_POSIX_X11 1 + + #elif defined(__APPLE__)