add libpng16 package and updated sdl2 packages

Ninoh-FOX · Jun 6, 2021 · a01d3b5 · a01d3b5
1 parent 4a54777
commit a01d3b5
Show file tree

Hide file tree

Showing 48 changed files with 51 additions and 32 deletions.
diff --git a/board/opendingux/pg/target_skeleton/usr/lib/.empty b/board/opendingux/pg/target_skeleton/usr/lib/.empty
diff --git a/board/opendingux/pg/target_skeleton/usr/lib/libpng16.so b/board/opendingux/pg/target_skeleton/usr/lib/libpng16.so
diff --git a/board/opendingux/pg/target_skeleton/usr/lib/libpng16.so.16 b/board/opendingux/pg/target_skeleton/usr/lib/libpng16.so.16
diff --git a/board/opendingux/pg/target_skeleton/usr/lib/libpng16.so.16.37.0 b/board/opendingux/pg/target_skeleton/usr/lib/libpng16.so.16.37.0
diff --git a/board/opendingux/pg2/target_skeleton/usr/lib/.empty b/board/opendingux/pg2/target_skeleton/usr/lib/.empty
diff --git a/board/opendingux/pg2/target_skeleton/usr/lib/libpng16.so b/board/opendingux/pg2/target_skeleton/usr/lib/libpng16.so
diff --git a/board/opendingux/pg2/target_skeleton/usr/lib/libpng16.so.16 b/board/opendingux/pg2/target_skeleton/usr/lib/libpng16.so.16
diff --git a/board/opendingux/pg2/target_skeleton/usr/lib/libpng16.so.16.37.0 b/board/opendingux/pg2/target_skeleton/usr/lib/libpng16.so.16.37.0
diff --git a/board/opendingux/pg2v2/target_skeleton/usr/lib/.empty b/board/opendingux/pg2v2/target_skeleton/usr/lib/.empty
diff --git a/board/opendingux/pg2v2/target_skeleton/usr/lib/libpng16.so b/board/opendingux/pg2v2/target_skeleton/usr/lib/libpng16.so
diff --git a/board/opendingux/pg2v2/target_skeleton/usr/lib/libpng16.so.16 b/board/opendingux/pg2v2/target_skeleton/usr/lib/libpng16.so.16
diff --git a/board/opendingux/pg2v2/target_skeleton/usr/lib/libpng16.so.16.37.0 b/board/opendingux/pg2v2/target_skeleton/usr/lib/libpng16.so.16.37.0
diff --git a/board/opendingux/rg280m/target_skeleton/usr/lib/.empty b/board/opendingux/rg280m/target_skeleton/usr/lib/.empty
diff --git a/board/opendingux/rg280m/target_skeleton/usr/lib/libpng16.so b/board/opendingux/rg280m/target_skeleton/usr/lib/libpng16.so
diff --git a/board/opendingux/rg280m/target_skeleton/usr/lib/libpng16.so.16 b/board/opendingux/rg280m/target_skeleton/usr/lib/libpng16.so.16
diff --git a/board/opendingux/rg280m/target_skeleton/usr/lib/libpng16.so.16.37.0 b/board/opendingux/rg280m/target_skeleton/usr/lib/libpng16.so.16.37.0
diff --git a/board/opendingux/rg280v/target_skeleton/usr/lib/.empty b/board/opendingux/rg280v/target_skeleton/usr/lib/.empty
diff --git a/board/opendingux/rg280v/target_skeleton/usr/lib/libpng16.so b/board/opendingux/rg280v/target_skeleton/usr/lib/libpng16.so
diff --git a/board/opendingux/rg280v/target_skeleton/usr/lib/libpng16.so.16 b/board/opendingux/rg280v/target_skeleton/usr/lib/libpng16.so.16
diff --git a/board/opendingux/rg280v/target_skeleton/usr/lib/libpng16.so.16.37.0 b/board/opendingux/rg280v/target_skeleton/usr/lib/libpng16.so.16.37.0
diff --git a/board/opendingux/rg350/target_skeleton/usr/lib/.empty b/board/opendingux/rg350/target_skeleton/usr/lib/.empty
diff --git a/board/opendingux/rg350/target_skeleton/usr/lib/libpng16.so b/board/opendingux/rg350/target_skeleton/usr/lib/libpng16.so
diff --git a/board/opendingux/rg350/target_skeleton/usr/lib/libpng16.so.16 b/board/opendingux/rg350/target_skeleton/usr/lib/libpng16.so.16
diff --git a/board/opendingux/rg350/target_skeleton/usr/lib/libpng16.so.16.37.0 b/board/opendingux/rg350/target_skeleton/usr/lib/libpng16.so.16.37.0
diff --git a/board/opendingux/rg350m/target_skeleton/usr/lib/.empty b/board/opendingux/rg350m/target_skeleton/usr/lib/.empty
diff --git a/board/opendingux/rg350m/target_skeleton/usr/lib/libpng16.so b/board/opendingux/rg350m/target_skeleton/usr/lib/libpng16.so
diff --git a/board/opendingux/rg350m/target_skeleton/usr/lib/libpng16.so.16 b/board/opendingux/rg350m/target_skeleton/usr/lib/libpng16.so.16
diff --git a/board/opendingux/rg350m/target_skeleton/usr/lib/libpng16.so.16.37.0 b/board/opendingux/rg350m/target_skeleton/usr/lib/libpng16.so.16.37.0
diff --git a/board/opendingux/rg350p/target_skeleton/usr/lib/.empty b/board/opendingux/rg350p/target_skeleton/usr/lib/.empty
diff --git a/board/opendingux/rg350p/target_skeleton/usr/lib/libpng16.so b/board/opendingux/rg350p/target_skeleton/usr/lib/libpng16.so
diff --git a/board/opendingux/rg350p/target_skeleton/usr/lib/libpng16.so.16 b/board/opendingux/rg350p/target_skeleton/usr/lib/libpng16.so.16
diff --git a/board/opendingux/rg350p/target_skeleton/usr/lib/libpng16.so.16.37.0 b/board/opendingux/rg350p/target_skeleton/usr/lib/libpng16.so.16.37.0
diff --git a/configs/playgo_defconfig b/configs/playgo_defconfig
@@ -164,6 +164,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/configs/playgov2_defconfig b/configs/playgov2_defconfig
@@ -164,6 +164,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/configs/pocketgo2_defconfig b/configs/pocketgo2_defconfig
@@ -164,6 +164,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/configs/pocketgo2v2_defconfig b/configs/pocketgo2v2_defconfig
@@ -164,6 +164,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/configs/rg280m_defconfig b/configs/rg280m_defconfig
@@ -164,6 +164,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/configs/rg280v_defconfig b/configs/rg280v_defconfig
@@ -162,6 +162,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/configs/rg350_defconfig b/configs/rg350_defconfig
@@ -164,6 +164,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/configs/rg350m_defconfig b/configs/rg350m_defconfig
@@ -164,6 +164,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/configs/rg350p_defconfig b/configs/rg350p_defconfig
@@ -164,6 +164,7 @@ BR2_PACKAGE_LIBHUGETLBFS=y
 BR2_PACKAGE_LIGHTNING=y
 BR2_PACKAGE_LIGHTREC=y
 BR2_PACKAGE_JPEG_TURBO=y
+BR2_PACKAGE_LIBPNG16=y
 BR2_PACKAGE_LIBPTHREAD_STUBS=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_LIBMIKMOD=y

diff --git a/package/Config.in b/package/Config.in
@@ -671,6 +671,7 @@ menu "Graphics"
 	source "package/libglu/Config.in"
 	source "package/libgtk2/Config.in"
 	source "package/libpng/Config.in"
+	source "package/libpng16/Config.in"
 	source "package/libqrencode/Config.in"
 	source "package/libraw/Config.in"
 	source "package/librsvg/Config.in"

diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
@@ -1,12 +1,12 @@
 ################################################################################
 #
-# libpng
+# libpng 1.4.13 >> 1.4.15
 #
 ################################################################################
 
-LIBPNG_VERSION = 1.4.13
+LIBPNG_VERSION = 1.4.15
 LIBPNG_SERIES = 14
-LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
+LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.gz
 LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/older-releases/$(LIBPNG_VERSION)
 LIBPNG_LICENSE = libpng license
 LIBPNG_LICENSE_FILES = LICENSE

diff --git a/package/libpng16/Config.in b/package/libpng16/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBPNG16
+	bool "libpng16"
+	select BR2_PACKAGE_ZLIB
+	help
+	  Library for handling PNG (Portable Network Graphics)
+	  images.
+
+	  http://www.libpng.org/
diff --git a/package/libpng16/libpng16.mk b/package/libpng16/libpng16.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# libpng16
+#
+################################################################################
+
+LIBPNG16_VERSION = 1.6.16
+LIBPNG16_SERIES = 16
+LIBPNG16_SOURCE = libpng-$(LIBPNG16_VERSION).tar.gz
+LIBPNG16_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG16_SERIES}/older-releases/$(LIBPNG16_VERSION)
+LIBPNG16_LICENSE = libpng license
+LIBPNG16_LICENSE_FILES = LICENSE
+LIBPNG16_INSTALL_STAGING = YES
+LIBPNG16_DEPENDENCIES = host-pkgconf zlib
+LIBPNG16_CONFIG_SCRIPTS = libpng$(LIBPNG16_SERIES)-config libpng-config
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/package/sdl2_image/sdl2_image-libpng14.patch b/package/sdl2_image/sdl2_image-libpng14.patch
@@ -1,11 +1,10 @@
-diff -ru SDL2_image-2.0.0.org/IMG_png.c sdl2_image-2.0.0/IMG_png.c
---- SDL2_image-2.0.0.org/IMG_png.c	2013-08-10 19:38:36.000000000 +0200
-+++ sdl2_image-2.0.0/IMG_png.c	2014-07-03 19:57:14.773270137 +0200
-@@ -76,6 +76,7 @@
+--- a/IMG_png.c	2019-06-30 06:52:03.000000000 +0200
++++ b/IMG_png.c	2021-06-06 09:05:44.499550925 +0200
+@@ -86,6 +86,7 @@
  #if (PNG_LIBPNG_VER_MINOR < 6)
- typedef png_structp png_const_structrp;
- typedef png_infop png_const_inforp;
+ typedef png_structp png_structrp;
+ typedef png_infop png_inforp;
 +typedef png_bytep png_const_bytep;
- #endif
- #endif
-
+ typedef png_const_structp png_const_structrp;
+ typedef png_const_infop png_const_inforp;
+ /* noconst15: version < 1.6 doesn't have const, >= 1.6 adds it */
diff --git a/package/sdl2_image/sdl2_image.mk b/package/sdl2_image/sdl2_image.mk
@@ -1,10 +1,10 @@
 ################################################################################
 #
-# sdl2_image
+# sdl2_image 2.0.0>>2.0.5
 #
 ################################################################################
 
-SDL2_IMAGE_VERSION = 2.0.0
+SDL2_IMAGE_VERSION = 2.0.5
 SDL2_IMAGE_SOURCE = SDL2_image-$(SDL2_IMAGE_VERSION).tar.gz
 SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
 SDL2_IMAGE_INSTALL_STAGING = YES

diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk
@@ -1,10 +1,10 @@
 ################################################################################
 #
-# sdl2_mixer  2.0.1>>2.0.0
+# sdl2_mixer  2.0.4>>2.0.1>>2.0.0
 #
 ################################################################################
 
-SDL2_MIXER_VERSION = 2.0.1
+SDL2_MIXER_VERSION = 2.0.4
 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz
 SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release/
 SDL2_MIXER_INSTALL_STAGING = YES