summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-08-04 01:41:59 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commitcce8f7a72a40aaebe5f9970486b06c6aa18d1d16 (patch)
tree3bd4bab47c6c4891b556215cdf346f683a9a2ae2
parentb6af6bb4797b0de802f24563b39a48fb6296e15a (diff)
downloadslackbuilds-cce8f7a72a40aaebe5f9970486b06c6aa18d1d16.tar.gz
libraries/t4k_common: Patched SlackBuild.
Fixes build with libpng16 on -current.
-rw-r--r--libraries/t4k_common/libpng.patch17
-rw-r--r--libraries/t4k_common/t4k_common.SlackBuild3
2 files changed, 20 insertions, 0 deletions
diff --git a/libraries/t4k_common/libpng.patch b/libraries/t4k_common/libpng.patch
new file mode 100644
index 0000000000..c6d66c0877
--- /dev/null
+++ b/libraries/t4k_common/libpng.patch
@@ -0,0 +1,17 @@
+diff -u -r t4k_common-0.1.1/src/t4k_loaders.c t4k_common-0.1.1-patched/src/t4k_loaders.c
+--- t4k_common-0.1.1/src/t4k_loaders.c 2011-04-08 03:46:07.000000000 +0100
++++ t4k_common-0.1.1-patched/src/t4k_loaders.c 2015-08-04 01:37:04.120998907 +0100
+@@ -1028,12 +1028,7 @@
+ {
+ png_init_io(png_ptr, fi);
+
+- info_ptr->width = surf->w;
+- info_ptr->height = surf->h;
+- info_ptr->bit_depth = 8;
+- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+- info_ptr->interlace_type = 1;
+- info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */
++ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+
+ png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+ PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/libraries/t4k_common/t4k_common.SlackBuild b/libraries/t4k_common/t4k_common.SlackBuild
index 2975a8ff48..9fb0cad487 100644
--- a/libraries/t4k_common/t4k_common.SlackBuild
+++ b/libraries/t4k_common/t4k_common.SlackBuild
@@ -51,6 +51,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch for libpng16 (-current) (from Debian)
+patch -p1 < $CWD/libpng.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \