freeglut: Bump to 3.4.0
This commit is contained in:
Tee KOBAYASHI
xtkoba
parent
0831631586
commit
8c0ae06581
|
|
@ -1,73 +0,0 @@
|
|||
diff -uNr freeglut-3.2.1/CMakeLists.txt freeglut-3.2.1.mod/CMakeLists.txt
|
||||
--- freeglut-3.2.1/CMakeLists.txt 2019-09-25 23:43:34.000000000 +0300
|
||||
+++ freeglut-3.2.1.mod/CMakeLists.txt 2019-12-22 01:41:57.186531157 +0200
|
||||
@@ -145,7 +145,7 @@
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
-ELSEIF(ANDROID OR BLACKBERRY)
|
||||
+ELSEIF(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?
|
||||
@@ -303,14 +303,14 @@
|
||||
|
||||
IF(CMAKE_COMPILER_IS_GNUCC)
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
|
||||
- IF(NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
|
||||
+ IF(NOT(BLACKBERRY OR FREEGLUT_WAYLAND))
|
||||
# not setting -ansi as EGL/KHR headers doesn't support it
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
|
||||
ENDIF()
|
||||
ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
||||
|
||||
INCLUDE(CheckIncludeFiles)
|
||||
-IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
|
||||
+IF(UNIX AND NOT(BLACKBERRY OR FREEGLUT_WAYLAND))
|
||||
FIND_PACKAGE(X11 REQUIRED)
|
||||
INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH})
|
||||
LIST(APPEND LIBS ${X11_X11_LIB})
|
||||
@@ -330,11 +330,7 @@
|
||||
MESSAGE(FATAL_ERROR "Missing X11's XInput.h (X11/extensions/XInput.h)")
|
||||
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)
|
||||
@@ -455,19 +451,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
|
||||
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid")
|
||||
- ENDIF()
|
||||
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+")
|
||||
- ENDIF()
|
||||
ENDIF()
|
||||
IF(FREEGLUT_BUILD_SHARED_LIBS)
|
||||
TARGET_LINK_LIBRARIES(freeglut ${LIBS})
|
||||
@@ -571,9 +554,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()
|
||||
|
|
@ -2,13 +2,17 @@ TERMUX_PKG_HOMEPAGE=http://freeglut.sourceforge.net/
|
|||
TERMUX_PKG_DESCRIPTION="Provides functionality for small OpenGL programs"
|
||||
TERMUX_PKG_LICENSE="MIT"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=3.2.1
|
||||
TERMUX_PKG_REVISION=16
|
||||
TERMUX_PKG_VERSION=3.4.0
|
||||
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/freeglut/freeglut-$TERMUX_PKG_VERSION.tar.gz
|
||||
TERMUX_PKG_SHA256=d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68
|
||||
TERMUX_PKG_DEPENDS="glu, libxi, libxrandr, mesa"
|
||||
TERMUX_PKG_SHA256=3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec
|
||||
TERMUX_PKG_DEPENDS="glu, libx11, libxi, libxrandr, mesa"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
-DANDROID_NO_TERMUX=OFF
|
||||
"
|
||||
|
||||
termux_step_pre_configure() {
|
||||
CFLAGS+=" -fcommon"
|
||||
termux_step_post_get_source() {
|
||||
sed -i CMakeLists.txt \
|
||||
-e 's/\([^A-Za-z0-9_]ANDROID\)\([^A-Za-z0-9_]\)/\1_NO_TERMUX\2/g' \
|
||||
-e 's/\([^A-Za-z0-9_]ANDROID\)$/\1_NO_TERMUX/g'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,12 @@
|
|||
diff -uNr freeglut-3.2.1/src/fg_internal.h freeglut-3.2.1.mod/src/fg_internal.h
|
||||
--- freeglut-3.2.1/src/fg_internal.h 2019-09-25 13:08:07.000000000 +0300
|
||||
+++ freeglut-3.2.1.mod/src/fg_internal.h 2019-12-22 01:43:56.649519813 +0200
|
||||
@@ -46,13 +46,10 @@
|
||||
@@ -46,7 +46,7 @@
|
||||
|| ( 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 0
|
||||
# define TARGET_HOST_ANDROID 1
|
||||
|
||||
-#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)
|
||||
+#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) || defined(__ANDROID__)
|
||||
# if defined(FREEGLUT_WAYLAND)
|
||||
# define TARGET_HOST_POSIX_WAYLAND 1
|
||||
# else
|
||||
#elif defined (__QNXNTO__) || defined (__PLAYBOOK__)
|
||||
|
|
|
|||
Loading…
Reference in New Issue