summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ffmpeg.mk4
-rw-r--r--src/gdal-1-fixes.patch280
-rw-r--r--src/gdal.mk4
-rw-r--r--src/openscenegraph-1-fixes.patch124
-rw-r--r--src/openscenegraph.mk16
5 files changed, 54 insertions, 374 deletions
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 853be97..2757c6b 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -3,8 +3,8 @@
PKG := ffmpeg
$(PKG)_WEBSITE := https://ffmpeg.org/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 3.4
-$(PKG)_CHECKSUM := 5d8911fe6017d00c98a359d7c8e7818e48f2c0cc2c9086a986ea8cb4d478c85e
+$(PKG)_VERSION := 3.4.1
+$(PKG)_CHECKSUM := f3443e20154a590ab8a9eef7bc951e8731425efc75b44ff4bee31d8a7a574a2c
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://ffmpeg.org/releases/$($(PKG)_FILE)
diff --git a/src/gdal-1-fixes.patch b/src/gdal-1-fixes.patch
index dae453e..08c5ed2 100644
--- a/src/gdal-1-fixes.patch
+++ b/src/gdal-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luke Potgieter <fried.roadkill+ght@gmail.com>
Date: Tue, 29 Aug 2017 16:31:09 +0200
-Subject: [PATCH 1/3] Detect spatialite more effectively than just checking for
+Subject: [PATCH 1/2] Detect spatialite more effectively than just checking for
headers in the system paths. PostgreSQL detection requires -lpthread when
building statically.
@@ -23,7 +23,7 @@ index 1111111..2222222 100644
if test "${HAVE_PG}" = "yes" ; then
LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS"
-@@ -3544,16 +3544,21 @@ AC_ARG_WITH(spatialite-soname,
+@@ -3557,16 +3557,21 @@ AC_ARG_WITH(spatialite-soname,
HAVE_SPATIALITE=no
SPATIALITE_AMALGAMATION=no
@@ -74,7 +74,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luke Potgieter <fried.roadkill+ght@gmail.com>
Date: Tue, 26 Sep 2017 14:56:19 +0200
-Subject: [PATCH 2/3] Use the new proj dll version number for the latest proj.
+Subject: [PATCH 2/2] Use the new proj dll version number for the latest proj.
diff --git a/ogr/ogrct.cpp b/ogr/ogrct.cpp
@@ -93,277 +93,3 @@ index 1111111..2222222 100644
#elif defined(__APPLE__)
# define LIBNAME "libproj.dylib"
#else
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sun, 19 Nov 2017 12:01:30 +1100
-Subject: [PATCH 3/3] Add support for openjpeg 2.3
-
-taken from:
-https://trac.osgeo.org/gdal/changeset/40330
-
-diff --git a/configure b/configure
-index 1111111..2222222 100755
---- a/configure
-+++ b/configure
-@@ -25116,19 +25116,20 @@ $as_echo "$as_me: OpenJPEG (JPEG2000) support disabled." >&6;}
-
- elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then
-
-- for ac_header in openjpeg-2.2/openjpeg.h
-+
-+ for ac_header in openjpeg-2.3/openjpeg.h
- do :
-- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.2/openjpeg.h" "ac_cv_header_openjpeg_2_2_openjpeg_h" "$ac_includes_default"
--if test "x$ac_cv_header_openjpeg_2_2_openjpeg_h" = xyes; then :
-+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.3/openjpeg.h" "ac_cv_header_openjpeg_2_3_openjpeg_h" "$ac_includes_default"
-+if test "x$ac_cv_header_openjpeg_2_3_openjpeg_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
--#define HAVE_OPENJPEG_2_2_OPENJPEG_H 1
-+#define HAVE_OPENJPEG_2_3_OPENJPEG_H 1
- _ACEOF
-
- fi
-
- done
-
-- if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then
-+ if test "$ac_cv_header_openjpeg_2_3_openjpeg_h" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
- $as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; }
- if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then :
-@@ -25172,23 +25173,23 @@ else
- fi
-
- if test "$HAVE_OPENJPEG" = "yes"; then
-- OPENJPEG_VERSION=20200
-+ OPENJPEG_VERSION=20300
- LIBS="-lopenjp2 $LIBS"
- fi
- else
-- for ac_header in openjpeg-2.1/openjpeg.h
-+ for ac_header in openjpeg-2.2/openjpeg.h
- do :
-- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.1/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default"
--if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then :
-+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.2/openjpeg.h" "ac_cv_header_openjpeg_2_2_openjpeg_h" "$ac_includes_default"
-+if test "x$ac_cv_header_openjpeg_2_2_openjpeg_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
--#define HAVE_OPENJPEG_2_1_OPENJPEG_H 1
-+#define HAVE_OPENJPEG_2_2_OPENJPEG_H 1
- _ACEOF
-
- fi
-
- done
-
-- if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then
-+ if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
- $as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; }
- if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then :
-@@ -25232,23 +25233,23 @@ else
- fi
-
- if test "$HAVE_OPENJPEG" = "yes"; then
-- OPENJPEG_VERSION=20100
-+ OPENJPEG_VERSION=20200
- LIBS="-lopenjp2 $LIBS"
- fi
- else
-- for ac_header in openjpeg-2.0/openjpeg.h
-+ for ac_header in openjpeg-2.1/openjpeg.h
- do :
-- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.0/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default"
--if test "x$ac_cv_header_openjpeg_2_0_openjpeg_h" = xyes; then :
-+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.1/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default"
-+if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
--#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1
-+#define HAVE_OPENJPEG_2_1_OPENJPEG_H 1
- _ACEOF
-
- fi
-
- done
-
-- if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then
-+ if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
- $as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; }
- if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then :
-@@ -25292,8 +25293,69 @@ else
- fi
-
- if test "$HAVE_OPENJPEG" = "yes"; then
-+ OPENJPEG_VERSION=20100
- LIBS="-lopenjp2 $LIBS"
- fi
-+ else
-+ for ac_header in openjpeg-2.0/openjpeg.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.0/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default"
-+if test "x$ac_cv_header_openjpeg_2_0_openjpeg_h" = xyes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+ if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
-+$as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; }
-+if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lopenjp2 $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opj_stream_set_user_data_length ();
-+int
-+main ()
-+{
-+return opj_stream_set_user_data_length ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_openjp2_opj_stream_set_user_data_length=yes
-+else
-+ ac_cv_lib_openjp2_opj_stream_set_user_data_length=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjp2_opj_stream_set_user_data_length" >&5
-+$as_echo "$ac_cv_lib_openjp2_opj_stream_set_user_data_length" >&6; }
-+if test "x$ac_cv_lib_openjp2_opj_stream_set_user_data_length" = xyes; then :
-+ HAVE_OPENJPEG=yes
-+else
-+ HAVE_OPENJPEG=no
-+fi
-+
-+ if test "$HAVE_OPENJPEG" = "yes"; then
-+ LIBS="-lopenjp2 $LIBS"
-+ fi
-+ fi
- fi
- fi
- fi
-@@ -25308,8 +25370,11 @@ else
- elif test -r $with_openjpeg/include/openjpeg-2.2/openjpeg.h ; then
- OPENJPEG_VERSION=20200
- EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
-+ elif test -r $with_openjpeg/include/openjpeg-2.3/openjpeg.h ; then
-+ OPENJPEG_VERSION=20300
-+ EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
- else
-- as_fn_error $? "openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1 or $with_openjpeg/include/openjpeg-2.2" "$LINENO" 5
-+ as_fn_error $? "openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1 or $with_openjpeg/include/openjpeg-2.2 or $with_openjpeg/include/openjpeg-2.3" "$LINENO" 5
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
-diff --git a/configure.ac b/configure.ac
-index 1111111..2222222 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2539,28 +2539,38 @@ if test "$with_openjpeg" = "no" ; then
-
- elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then
-
-- AC_CHECK_HEADERS([openjpeg-2.2/openjpeg.h])
-- if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then
-+
-+ AC_CHECK_HEADERS([openjpeg-2.3/openjpeg.h])
-+ if test "$ac_cv_header_openjpeg_2_3_openjpeg_h" = "yes"; then
- AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,)
- if test "$HAVE_OPENJPEG" = "yes"; then
-- OPENJPEG_VERSION=20200
-+ OPENJPEG_VERSION=20300
- LIBS="-lopenjp2 $LIBS"
- fi
- else
-- AC_CHECK_HEADERS([openjpeg-2.1/openjpeg.h])
-- if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then
-+ AC_CHECK_HEADERS([openjpeg-2.2/openjpeg.h])
-+ if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then
- AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,)
- if test "$HAVE_OPENJPEG" = "yes"; then
-- OPENJPEG_VERSION=20100
-+ OPENJPEG_VERSION=20200
- LIBS="-lopenjp2 $LIBS"
- fi
- else
-- AC_CHECK_HEADERS([openjpeg-2.0/openjpeg.h])
-- if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then
-+ AC_CHECK_HEADERS([openjpeg-2.1/openjpeg.h])
-+ if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then
- AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,)
- if test "$HAVE_OPENJPEG" = "yes"; then
-+ OPENJPEG_VERSION=20100
- LIBS="-lopenjp2 $LIBS"
- fi
-+ else
-+ AC_CHECK_HEADERS([openjpeg-2.0/openjpeg.h])
-+ if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then
-+ AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,)
-+ if test "$HAVE_OPENJPEG" = "yes"; then
-+ LIBS="-lopenjp2 $LIBS"
-+ fi
-+ fi
- fi
- fi
- fi
-@@ -2575,8 +2585,11 @@ else
- elif test -r $with_openjpeg/include/openjpeg-2.2/openjpeg.h ; then
- OPENJPEG_VERSION=20200
- EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
-+ elif test -r $with_openjpeg/include/openjpeg-2.3/openjpeg.h ; then
-+ OPENJPEG_VERSION=20300
-+ EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
- else
-- AC_MSG_ERROR([openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1 or $with_openjpeg/include/openjpeg-2.2])
-+ AC_MSG_ERROR([openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1 or $with_openjpeg/include/openjpeg-2.2 or $with_openjpeg/include/openjpeg-2.3])
- fi
-
- AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,-L$with_openjpeg/lib)
-diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp
-index 1111111..2222222 100644
---- a/frmts/openjpeg/openjpegdataset.cpp
-+++ b/frmts/openjpeg/openjpegdataset.cpp
-@@ -34,7 +34,9 @@
- #pragma clang diagnostic ignored "-Wdocumentation"
- #endif
-
--#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200
-+#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20300
-+#include <openjpeg-2.3/openjpeg.h>
-+#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200
- #include <openjpeg-2.2/openjpeg.h>
- #elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
- #include <openjpeg-2.1/openjpeg.h>
-diff --git a/nmake.opt b/nmake.opt
-index 1111111..2222222 100644
---- a/nmake.opt
-+++ b/nmake.opt
-@@ -611,6 +611,8 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include
- #OPENJPEG_VERSION = 20100
- # For OpenJpeg 2.2.x, uncomment
- #OPENJPEG_VERSION = 20200
-+# For OpenJpeg 2.3.x, uncomment
-+#OPENJPEG_VERSION = 20300
-
- #if using an external zlib uncomment the following lines
- #ZLIB_EXTERNAL_LIB = 1
diff --git a/src/gdal.mk b/src/gdal.mk
index 124e075..4963296 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -4,8 +4,8 @@ PKG := gdal
$(PKG)_WEBSITE := http://www.gdal.org/
$(PKG)_DESCR := GDAL
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2.2.2
-$(PKG)_CHECKSUM := 14c1f78a60f429ad51c08d75cbf49771f1e6b20e7385c6e8379b40e8dfa39544
+$(PKG)_VERSION := 2.2.3
+$(PKG)_CHECKSUM := 52f01bda8968643633016769607e6082a8ba1c746fadc2c1abe12cf7dc8f61dd
$(PKG)_SUBDIR := gdal-$($(PKG)_VERSION)
$(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/openscenegraph-1-fixes.patch b/src/openscenegraph-1-fixes.patch
index 127a063..f4e47e3 100644
--- a/src/openscenegraph-1-fixes.patch
+++ b/src/openscenegraph-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 9 Oct 2015 11:13:12 +0200
-Subject: [PATCH 1/7] fix case in headers windows.h, winsock2.h
+Subject: [PATCH 1/6] fix case in headers windows.h, winsock2.h
diff --git a/examples/osghangglide/hat.cpp b/examples/osghangglide/hat.cpp
@@ -21,19 +21,6 @@ index 1111111..2222222 100644
#pragma warning( disable : 4244 )
#endif
-diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
-index 1111111..2222222 100644
---- a/src/osg/DisplaySettings.cpp
-+++ b/src/osg/DisplaySettings.cpp
-@@ -24,7 +24,7 @@ using namespace osg;
- using namespace std;
-
- #if defined(WIN32) && !defined(__CYGWIN__)
--#include<Windows.h>
-+#include<windows.h>
- extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; }
- #else
- extern "C" { int NvOptimusEnablement=0x00000001; }
diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h
index 1111111..2222222 100644
--- a/src/osgPlugins/ply/typedefs.h
@@ -51,75 +38,9 @@ index 1111111..2222222 100644
# include <osg/Notify>
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Fri, 9 Oct 2015 12:54:07 +0200
-Subject: [PATCH 2/7] fix case in library ws2_32
-
-
-diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
-index 1111111..2222222 100644
---- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
-+++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
-@@ -19,7 +19,7 @@ IF(WIN32)
- mdns_win/dns_sd.h
- mdns_win/dns-sd.c
- )
-- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
-+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
- SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
- ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
- ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)
-diff --git a/src/osgPlugins/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt
-index 1111111..2222222 100644
---- a/src/osgPlugins/osc/CMakeLists.txt
-+++ b/src/osgPlugins/osc/CMakeLists.txt
-@@ -35,7 +35,7 @@ if(WIN32 AND NOT ANDROID)
- ip/win32/NetworkingUtils.cpp
- ip/win32/UdpSocket.cpp
- )
-- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
-+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
- ELSE()
- SET(TARGET_SRC
- ${TARGET_SRC}
-diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt
-index 1111111..2222222 100644
---- a/src/osgPlugins/vrml/CMakeLists.txt
-+++ b/src/osgPlugins/vrml/CMakeLists.txt
-@@ -27,7 +27,7 @@ IF (WIN32)
- PNG_LIBRARY
- ZLIB_LIBRARY)
- SET(TARGET_EXTERNAL_LIBRARIES
-- Ws2_32.lib)
-+ ws2_32.lib)
- ELSE()
- SET(TARGET_LIBRARIES_VARS
- OPENVRML_LIBRARY)
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Fri, 9 Oct 2015 14:00:54 +0200
-Subject: [PATCH 3/7] fix pointer to int conversion on 64bit
-
-
-diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteVisitor.cpp
-index 1111111..2222222 100644
---- a/src/osgPlugins/osgjs/WriteVisitor.cpp
-+++ b/src/osgPlugins/osgjs/WriteVisitor.cpp
-@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime
- // no image file so use this inline name image and create a file
- std::stringstream ss;
- ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator();
-- ss << (long int)image << ".inline_conv_generated.png"; // write the pointer location
-+ ss << (uintptr_t)image << ".inline_conv_generated.png"; // write the pointer location
- std::string filename = ss.str();
- if (osgDB::writeImageFile(*image, filename)) {
- image->setFileName(filename);
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Sun, 10 Jan 2016 14:04:18 +1100
-Subject: [PATCH 4/7] openscenegraph: use previously built openthreads
+Subject: [PATCH 2/6] openscenegraph: use previously built openthreads
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -138,7 +59,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 10 Jan 2016 14:19:57 +1100
-Subject: [PATCH 5/7] use pkg-config for gstreamer detection in mingw
+Subject: [PATCH 3/6] use pkg-config for gstreamer detection in mingw
diff --git a/CMakeModules/FindGStreamer.cmake b/CMakeModules/FindGStreamer.cmake
@@ -158,7 +79,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 22 Feb 2016 03:35:28 +0300
-Subject: [PATCH 6/7] disable ffmpeg
+Subject: [PATCH 4/6] disable ffmpeg
OpenSceneGraph is using removed features of ffmpeg, which have
been deprecated for 3+ years.
@@ -185,14 +106,14 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <saiarcot895@gmail.com>
Date: Mon, 6 Jun 2016 19:06:00 -0500
-Subject: [PATCH 7/7] Require the presence of either qt5 or qt4.
+Subject: [PATCH 5/6] Require the presence of either qt5 or qt4.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -712,9 +712,9 @@ IF(OSG_USE_QT AND NOT ANDROID)
+@@ -708,9 +708,9 @@ IF(OSG_USE_QT AND NOT ANDROID)
IF (DESIRED_QT_VERSION)
IF (DESIRED_QT_VERSION MATCHES 5)
@@ -204,3 +125,36 @@ index 1111111..2222222 100644
ELSE()
FIND_PACKAGE(Qt3)
ENDIF()
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Boris Pek <tehnick-8@yandex.ru>
+Date: Thu, 14 Dec 2017 15:29:38 +0300
+Subject: [PATCH 6/6] fix case in library ws2_32
+
+
+diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
++++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
+@@ -19,7 +19,7 @@ IF(WIN32)
+ mdns_win/dns_sd.h
+ mdns_win/dns-sd.c
+ )
+- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
++ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
+ SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
+ ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
+ ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)
+diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/src/osgPlugins/vrml/CMakeLists.txt
++++ b/src/osgPlugins/vrml/CMakeLists.txt
+@@ -27,7 +27,7 @@ IF (WIN32)
+ PNG_LIBRARY
+ ZLIB_LIBRARY)
+ SET(TARGET_EXTERNAL_LIBRARIES
+- Ws2_32.lib)
++ ws2_32.lib)
+ ELSE()
+ SET(TARGET_LIBRARIES_VARS
+ OPENVRML_LIBRARY)
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk
index 2f121b9..5511658 100644
--- a/src/openscenegraph.mk
+++ b/src/openscenegraph.mk
@@ -4,19 +4,19 @@ PKG := openscenegraph
$(PKG)_WEBSITE := http://www.openscenegraph.org/
$(PKG)_DESCR := OpenSceneGraph
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 3.4.0
-$(PKG)_CHECKSUM := 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e3040e
-$(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION)
-$(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip
-$(PKG)_URL := http://trac.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE)
+$(PKG)_VERSION := 3.4.1
+$(PKG)_CHECKSUM := 930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
+#$(PKG)_GH_CONF := openscenegraph/OpenSceneGraph/tags, OpenSceneGraph-
+$(PKG)_SUBDIR := OpenSceneGraph-OpenSceneGraph-$($(PKG)_VERSION)
+$(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL := https://github.com/openscenegraph/OpenSceneGraph/archive/$($(PKG)_FILE)
$(PKG)_DEPS := gcc boost curl dcmtk freetype gdal giflib gstreamer \
gta jasper jpeg libpng openal openexr openthreads poppler \
qt tiff zlib
define $(PKG)_UPDATE
- $(WGET) -q -O- 'http://trac.openscenegraph.org/downloads/developer_releases/?C=M;O=D' | \
- $(SED) -n 's,.*OpenSceneGraph-\([0-9]*\.[0-9]*[02468]\.[^<]*\)\.zip.*,\1,p' | \
- grep -v rc | \
+ $(WGET) -q -O- 'http://www.openscenegraph.org/index.php/download-section/stable-releases' | \
+ $(SED) -n 's,.*OpenSceneGraph/tree/OpenSceneGraph-\([0-9]*\.[0-9]*[02468]\.[^<]*\)">.*,\1,p' | \
$(SORT) -V | \
tail -1
endef
generated by cgit v0.12 at 2025-04-02 14:52:42 (GMT)