pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/libheif
Module Name: pkgsrc
Committed By: otis
Date: Thu Sep 3 19:07:19 UTC 2020
Modified Files:
pkgsrc/graphics/libheif: Makefile distinfo
Added Files:
pkgsrc/graphics/libheif/patches: patch-examples_heif__convert.cc
patch-examples_heif__enc.cc patch-examples_heif__info.cc
patch-examples_heif__test.cc patch-libheif_heif__encoder__aom.cc
Log Message:
graphics/libheif: Fix build with gcc 7.5
Fix build on platforms with gcc 7.5, like SmartOS.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/libheif/Makefile \
pkgsrc/graphics/libheif/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/libheif/patches/patch-examples_heif__convert.cc \
pkgsrc/graphics/libheif/patches/patch-examples_heif__enc.cc \
pkgsrc/graphics/libheif/patches/patch-examples_heif__info.cc \
pkgsrc/graphics/libheif/patches/patch-examples_heif__test.cc \
pkgsrc/graphics/libheif/patches/patch-libheif_heif__encoder__aom.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/libheif/Makefile
diff -u pkgsrc/graphics/libheif/Makefile:1.1 pkgsrc/graphics/libheif/Makefile:1.2
--- pkgsrc/graphics/libheif/Makefile:1.1 Mon Aug 31 17:24:12 2020
+++ pkgsrc/graphics/libheif/Makefile Thu Sep 3 19:07:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/08/31 17:24:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2020/09/03 19:07:19 otis Exp $
DISTNAME= libheif-1.8.0
CATEGORIES= graphics
@@ -13,11 +13,13 @@ LICENSE= gnu-lgpl-v3
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config gmake
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= libheif.pc.in
+#BUILDLINK_TRANSFORM+= rm:-Werror
+
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../multimedia/libaom/buildlink3.mk"
Index: pkgsrc/graphics/libheif/distinfo
diff -u pkgsrc/graphics/libheif/distinfo:1.1 pkgsrc/graphics/libheif/distinfo:1.2
--- pkgsrc/graphics/libheif/distinfo:1.1 Mon Aug 31 17:24:12 2020
+++ pkgsrc/graphics/libheif/distinfo Thu Sep 3 19:07:19 2020
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.1 2020/08/31 17:24:12 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2020/09/03 19:07:19 otis Exp $
SHA1 (libheif-1.8.0.tar.gz) = 22476e2697faebee6802169ee1746cdcdd7953fa
RMD160 (libheif-1.8.0.tar.gz) = 68d53be124be293348023946ada37acee7432ea2
SHA512 (libheif-1.8.0.tar.gz) = e6edf03c0baf7d55ace57b8de1cf05d3b6708a0bd58d4191599960ad3924509dd7e9528a021586012b768a5a5b253e5bab470b944a2ead45f85274842da4913a
Size (libheif-1.8.0.tar.gz) = 1544438 bytes
SHA1 (patch-configure) = 859f4ae06e77a79a723f2760d426c88787916a9c
+SHA1 (patch-examples_heif__convert.cc) = bb7836d7ffdb18bb74f35c580b57df61d1533789
+SHA1 (patch-examples_heif__enc.cc) = 1c7dc8a1ed822727942d675d9ff6087b27d289e7
+SHA1 (patch-examples_heif__info.cc) = d0cd58c340d777a1bee63b7f0654ba5e193e7a62
+SHA1 (patch-examples_heif__test.cc) = ae4c07a340123da7b0f4f80b7c5b5de57d0b3cc1
+SHA1 (patch-libheif_heif__encoder__aom.cc) = 6554c39a76f853b0c46b63d6497d5d171e035f3e
Added files:
Index: pkgsrc/graphics/libheif/patches/patch-examples_heif__convert.cc
diff -u /dev/null pkgsrc/graphics/libheif/patches/patch-examples_heif__convert.cc:1.1
--- /dev/null Thu Sep 3 19:07:19 2020
+++ pkgsrc/graphics/libheif/patches/patch-examples_heif__convert.cc Thu Sep 3 19:07:19 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-examples_heif__convert.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
+
+Include alloca.h on SunOS
+
+--- examples/heif_convert.cc.orig 2020-08-13 16:57:45.000000000 +0000
++++ examples/heif_convert.cc
+@@ -35,6 +35,10 @@
+
+ #endif
+
++#if defined(sun) || defined(__sun)
++#include <alloca.h>
++#endif
++
+ #include <fstream>
+ #include <iostream>
+ #include <sstream>
Index: pkgsrc/graphics/libheif/patches/patch-examples_heif__enc.cc
diff -u /dev/null pkgsrc/graphics/libheif/patches/patch-examples_heif__enc.cc:1.1
--- /dev/null Thu Sep 3 19:07:19 2020
+++ pkgsrc/graphics/libheif/patches/patch-examples_heif__enc.cc Thu Sep 3 19:07:19 2020
@@ -0,0 +1,43 @@
+$NetBSD: patch-examples_heif__enc.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
+
+Excplicitly cast types to make ISO C++ happy
+
+--- examples/heif_enc.cc.orig 2020-08-14 15:28:08.000000000 +0000
++++ examples/heif_enc.cc
+@@ -71,21 +71,21 @@ int nclx_transfer_characteristic = 2;
+ int nclx_full_range = true;
+
+ static struct option long_options[] = {
+- {"help", no_argument, 0, 'h'},
+- {"quality", required_argument, 0, 'q'},
+- {"output", required_argument, 0, 'o'},
+- {"lossless", no_argument, 0, 'L'},
+- {"thumb", required_argument, 0, 't'},
+- {"verbose", no_argument, 0, 'v'},
+- {"params", no_argument, 0, 'P'},
+- {"no-alpha", no_argument, &master_alpha, 0},
+- {"no-thumb-alpha", no_argument, &thumb_alpha, 0},
+- {"bit-depth", required_argument, 0, 'b'},
+- {"avif", no_argument, 0, 'A'},
+- {"matrix_coefficients", required_argument, &nclx_matrix_coefficients, 0},
+- {"colour_primaries", required_argument, &nclx_colour_primaries, 0},
+- {"transfer_characteristic", required_argument, &nclx_transfer_characteristic, 0},
+- {"full_range_flag", required_argument, &nclx_full_range, 0},
++ {(char * const)"help", no_argument, 0, 'h'},
++ {(char * const)"quality", required_argument, 0, 'q'},
++ {(char * const)"output", required_argument, 0, 'o'},
++ {(char * const)"lossless", no_argument, 0, 'L'},
++ {(char * const)"thumb", required_argument, 0, 't'},
++ {(char * const)"verbose", no_argument, 0, 'v'},
++ {(char * const)"params", no_argument, 0, 'P'},
++ {(char * const)"no-alpha", no_argument, &master_alpha, 0},
++ {(char * const)"no-thumb-alpha", no_argument, &thumb_alpha, 0},
++ {(char * const)"bit-depth", required_argument, 0, 'b'},
++ {(char * const)"avif", no_argument, 0, 'A'},
++ {(char * const)"matrix_coefficients", required_argument, &nclx_matrix_coefficients, 0},
++ {(char * const)"colour_primaries", required_argument, &nclx_colour_primaries, 0},
++ {(char * const)"transfer_characteristic", required_argument, &nclx_transfer_characteristic, 0},
++ {(char * const)"full_range_flag", required_argument, &nclx_full_range, 0},
+ {0, 0, 0, 0}
+ };
+
Index: pkgsrc/graphics/libheif/patches/patch-examples_heif__info.cc
diff -u /dev/null pkgsrc/graphics/libheif/patches/patch-examples_heif__info.cc:1.1
--- /dev/null Thu Sep 3 19:07:19 2020
+++ pkgsrc/graphics/libheif/patches/patch-examples_heif__info.cc Thu Sep 3 19:07:19 2020
@@ -0,0 +1,28 @@
+$NetBSD: patch-examples_heif__info.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
+
+Excplicitly cast types to make ISO C++ happy
+
+--- examples/heif_info.cc.orig 2020-08-13 16:57:45.000000000 +0000
++++ examples/heif_info.cc
+@@ -38,6 +38,10 @@
+ #define STDOUT_FILENO 1
+ #endif
+
++#if defined(sun) || defined(__sun)
++#include <alloca.h>
++#endif
++
+ #include <libheif/heif.h>
+
+ #include <fstream>
+@@ -65,8 +69,8 @@ info -d // dump
+ static struct option long_options[] = {
+ //{"write-raw", required_argument, 0, 'w' },
+ //{"output", required_argument, 0, 'o' },
+- {"dump-boxes", no_argument, 0, 'd'},
+- {"help", no_argument, 0, 'h'},
++ {(char * const)"dump-boxes", no_argument, 0, 'd'},
++ {(char * const)"help", no_argument, 0, 'h'},
+ {0, 0, 0, 0}
+ };
+
Index: pkgsrc/graphics/libheif/patches/patch-examples_heif__test.cc
diff -u /dev/null pkgsrc/graphics/libheif/patches/patch-examples_heif__test.cc:1.1
--- /dev/null Thu Sep 3 19:07:19 2020
+++ pkgsrc/graphics/libheif/patches/patch-examples_heif__test.cc Thu Sep 3 19:07:19 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-examples_heif__test.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
+
+Excplicitly cast types to make ISO C++ happy
+
+--- examples/heif_test.cc.orig 2020-08-13 16:57:45.000000000 +0000
++++ examples/heif_test.cc
+@@ -50,8 +50,8 @@
+ static struct option long_options[] = {
+ //{"write-raw", required_argument, 0, 'w' },
+ //{"output", required_argument, 0, 'o' },
+- {"decode-img", required_argument, 0, 'd'},
+- {"metadata", required_argument, 0, 'm'},
++ {(char * const)"decode-img", required_argument, 0, 'd'},
++ {(char * const)"metadata", required_argument, 0, 'm'},
+ {0, 0, 0, 0}
+ };
+
Index: pkgsrc/graphics/libheif/patches/patch-libheif_heif__encoder__aom.cc
diff -u /dev/null pkgsrc/graphics/libheif/patches/patch-libheif_heif__encoder__aom.cc:1.1
--- /dev/null Thu Sep 3 19:07:19 2020
+++ pkgsrc/graphics/libheif/patches/patch-libheif_heif__encoder__aom.cc Thu Sep 3 19:07:19 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-libheif_heif__encoder__aom.cc,v 1.1 2020/09/03 19:07:19 otis Exp $
+
+Initialize variable to silence -Werror
+
+--- libheif/heif_encoder_aom.cc.orig 2020-08-26 13:47:18.000000000 +0000
++++ libheif/heif_encoder_aom.cc
+@@ -510,7 +510,7 @@ struct heif_error aom_encode_image(void*
+
+ aom_image_t input_image;
+
+- aom_img_fmt_t img_format;
++ aom_img_fmt_t img_format = AOM_IMG_FMT_NONE;
+
+ switch (chroma) {
+ case heif_chroma_420:
Home |
Main Index |
Thread Index |
Old Index