Date: Thu, 12 Oct 2017 09:28:39 +0200 From: Mathieu Arnold <mat@FreeBSD.org> To: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r451711 - in head: comms/qsstv/files graphics/gstreamer1-plugins-openjpeg graphics/gstreamer1-plugins-openjpeg/files graphics/leptonica/files graphics/mupdf/files graphics/openjpeg Message-ID: <aafb6fff-40f2-37a6-af68-6eb00edf5bca@FreeBSD.org> In-Reply-To: <201710101745.v9AHjv69002576@repo.freebsd.org> References: <201710101745.v9AHjv69002576@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --jlOf1OaOOEiQ0G27cdQV8f6ULaiTlUwd6 Content-Type: multipart/mixed; boundary="xsiKpqWRBNBiTXD95cVdAXU3VR2bejj3o"; protected-headers="v1" From: Mathieu Arnold <mat@FreeBSD.org> To: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Message-ID: <aafb6fff-40f2-37a6-af68-6eb00edf5bca@FreeBSD.org> Subject: Re: svn commit: r451711 - in head: comms/qsstv/files graphics/gstreamer1-plugins-openjpeg graphics/gstreamer1-plugins-openjpeg/files graphics/leptonica/files graphics/mupdf/files graphics/openjpeg References: <201710101745.v9AHjv69002576@repo.freebsd.org> In-Reply-To: <201710101745.v9AHjv69002576@repo.freebsd.org> --xsiKpqWRBNBiTXD95cVdAXU3VR2bejj3o Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: fr Le 10/10/2017 =C3=A0 19:45, Sunpoet Po-Chuan Hsieh a =C3=A9crit=C2=A0: > Author: sunpoet > Date: Tue Oct 10 17:45:57 2017 > New Revision: 451711 > URL: https://svnweb.freebsd.org/changeset/ports/451711 > > Log: > Update graphics/openjpeg to 2.3.0 After this, net/minidlna WITH=3DOPENJPEG is broken. https://pkg.absolight.fr/data/11amd64-pkgng-default/20171012T005652Z/logs= /errors/ffmpeg-3.3.4,1.log > =20 > Changes: https://github.com/uclouvain/openjpeg/blob/master/CHANGELOG.= md > PR: 222817 > Exp-run by: antoine > > Added: > head/graphics/gstreamer1-plugins-openjpeg/files/ > head/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23 (c= ontents, props changed) > head/graphics/leptonica/files/ > head/graphics/leptonica/files/patch-configure (contents, props chan= ged) > Modified: > head/comms/qsstv/files/patch-qsstv_utils_color.cpp > head/comms/qsstv/files/patch-qsstv_utils_jp2io.h > head/graphics/gstreamer1-plugins-openjpeg/Makefile > head/graphics/mupdf/files/patch-source__fitz__load-jpx.c > head/graphics/openjpeg/Makefile > head/graphics/openjpeg/distinfo > > Modified: head/comms/qsstv/files/patch-qsstv_utils_color.cpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/comms/qsstv/files/patch-qsstv_utils_color.cpp Tue Oct 10 17:45= :50 2017 (r451710) > +++ head/comms/qsstv/files/patch-qsstv_utils_color.cpp Tue Oct 10 17:45= :57 2017 (r451711) > @@ -5,7 +5,7 @@ > =20 > //#include "opj_apps_config.h" > -#include "openjpeg-2.1/openjpeg.h" > -+#include "openjpeg-2.2/openjpeg.h" > ++#include "openjpeg-2.3/openjpeg.h" > #include "color.h" > =20 > =20 > > Modified: head/comms/qsstv/files/patch-qsstv_utils_jp2io.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/comms/qsstv/files/patch-qsstv_utils_jp2io.h Tue Oct 10 17:45:5= 0 2017 (r451710) > +++ head/comms/qsstv/files/patch-qsstv_utils_jp2io.h Tue Oct 10 17:45:5= 7 2017 (r451711) > @@ -4,7 +4,7 @@ > #ifndef JP2READER_H > #define JP2READER_H > -#include "openjpeg.h" > -+#include "openjpeg-2.2/openjpeg.h" > ++#include "openjpeg-2.3/openjpeg.h" > =20 > #include <QString> > #include <QImage> > > Modified: head/graphics/gstreamer1-plugins-openjpeg/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/graphics/gstreamer1-plugins-openjpeg/Makefile Tue Oct 10 17:45= :50 2017 (r451710) > +++ head/graphics/gstreamer1-plugins-openjpeg/Makefile Tue Oct 10 17:45= :57 2017 (r451711) > @@ -10,4 +10,6 @@ DIST=3D bad > =20 > MASTERDIR=3D ${.CURDIR}/../../multimedia/gstreamer1-plugins > =20 > +EXTRA_PATCHES=3D ${.CURDIR}/files/patch-openjpeg23 > + > .include "${MASTERDIR}/Makefile" > > Added: head/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23 Tu= e Oct 10 17:45:57 2017 (r451711) > @@ -0,0 +1,163 @@ > +--- config.h.in.orig 2017-09-18 11:34:31 UTC > ++++ config.h.in > +@@ -459,6 +459,9 @@ > + /* Define if OpenJPEG 2.2 is used */ > + #undef HAVE_OPENJPEG_2_2 > +=20 > ++/* Define if OpenJPEG 2.3 is used */ > ++#undef HAVE_OPENJPEG_2_3 > ++ > + /* Define to enable openni2 library (used by openni2). */ > + #undef HAVE_OPENNI2 > +=20 > +--- configure.orig 2017-09-18 11:34:30 UTC > ++++ configure > +@@ -771,6 +771,8 @@ > + USE_OPENJPEG_FALSE > + USE_OPENJPEG_TRUE > + HAVE_OPENJPEG > ++OPENJPEG_2_3_LIBS > ++OPENJPEG_2_3_CFLAGS > + OPENJPEG_2_2_LIBS > + OPENJPEG_2_2_CFLAGS > + OPENJPEG_2_1_LIBS > +@@ -2043,6 +2045,8 @@ > + OPENJPEG_2_1_LIBS > + OPENJPEG_2_2_CFLAGS > + OPENJPEG_2_2_LIBS > ++OPENJPEG_2_3_CFLAGS > ++OPENJPEG_2_3_LIBS > + OPENNI2_CFLAGS > + OPENNI2_LIBS > + OPUS_CFLAGS > +@@ -3281,6 +3285,10 @@ > + C compiler flags for OPENJPEG_2_2, overriding pkg-confi= g > + OPENJPEG_2_2_LIBS > + linker flags for OPENJPEG_2_2, overriding pkg-config > ++ OPENJPEG_2_3_CFLAGS > ++ C compiler flags for OPENJPEG_2_3, overriding pkg-confi= g > ++ OPENJPEG_2_3_LIBS > ++ linker flags for OPENJPEG_2_3, overriding pkg-config > + OPENNI2_CFLAGS > + C compiler flags for OPENNI2, overriding pkg-config > + OPENNI2_LIBS > +@@ -48938,6 +48946,106 @@ > +=20 > + $as_echo "#define HAVE_OPENJPEG_2_2 1" >>confdefs.h > +=20 > ++ > ++ which=3D"libopenjp2 >=3D 2.3" > ++ required=3D"no" > ++ > ++ > ++pkg_failed=3Dno > ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENJPEG_2_3" >= &5 > ++$as_echo_n "checking for OPENJPEG_2_3... " >&6; } > ++ > ++if test -n "$PKG_CONFIG"; then > ++ if test -n "$OPENJPEG_2_3_CFLAGS"; then > ++ pkg_cv_OPENJPEG_2_3_CFLAGS=3D"$OPENJPEG_2_3_CFLAGS" > ++ else > ++ if test -n "$PKG_CONFIG" && \ > ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists = --print-errors \"\$which\""; } >&5 > ++ ($PKG_CONFIG --exists --print-errors "$which") 2>&5 > ++ ac_status=3D$? > ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 > ++ test $ac_status =3D 0; }; then > ++ pkg_cv_OPENJPEG_2_3_CFLAGS=3D`$PKG_CONFIG --cflags "$which" 2>/dev/= null` > ++else > ++ pkg_failed=3Dyes > ++fi > ++ fi > ++else > ++ pkg_failed=3Duntried > ++fi > ++if test -n "$PKG_CONFIG"; then > ++ if test -n "$OPENJPEG_2_3_LIBS"; then > ++ pkg_cv_OPENJPEG_2_3_LIBS=3D"$OPENJPEG_2_3_LIBS" > ++ else > ++ if test -n "$PKG_CONFIG" && \ > ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists = --print-errors \"\$which\""; } >&5 > ++ ($PKG_CONFIG --exists --print-errors "$which") 2>&5 > ++ ac_status=3D$? > ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 > ++ test $ac_status =3D 0; }; then > ++ pkg_cv_OPENJPEG_2_3_LIBS=3D`$PKG_CONFIG --libs "$which" 2>/dev/null= ` > ++else > ++ pkg_failed=3Dyes > ++fi > ++ fi > ++else > ++ pkg_failed=3Duntried > ++fi > ++ > ++ > ++ > ++if test $pkg_failed =3D yes; then > ++ > ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then > ++ _pkg_short_errors_supported=3Dyes > ++else > ++ _pkg_short_errors_supported=3Dno > ++fi > ++ if test $_pkg_short_errors_supported =3D yes; then > ++ OPENJPEG_2_3_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --erro= rs-to-stdout --print-errors "$which"` > ++ else > ++ OPENJPEG_2_3_PKG_ERRORS=3D`$PKG_CONFIG --errors-to-stdout --= print-errors "$which"` > ++ fi > ++ # Put the nasty error message in config.log where it belongs > ++ echo "$OPENJPEG_2_3_PKG_ERRORS" >&5 > ++ > ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > ++$as_echo "no" >&6; } > ++ > ++ HAVE_OPENJPEG_2_3=3D"no" > ++ if test "x$required" =3D "xyes"; then > ++ as_fn_error $? "$OPENJPEG_2_3_PKG_ERRORS" "$LINENO" 5 > ++ else > ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $OPENJPEG_2_3_PKG_ER= RORS" >&5 > ++$as_echo "$as_me: $OPENJPEG_2_3_PKG_ERRORS" >&6;} > ++ fi > ++ > ++elif test $pkg_failed =3D untried; then > ++ > ++ HAVE_OPENJPEG_2_3=3D"no" > ++ if test "x$required" =3D "xyes"; then > ++ as_fn_error $? "$OPENJPEG_2_3_PKG_ERRORS" "$LINENO" 5 > ++ else > ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $OPENJPEG_2_3_PKG_ER= RORS" >&5 > ++$as_echo "$as_me: $OPENJPEG_2_3_PKG_ERRORS" >&6;} > ++ fi > ++ > ++else > ++ OPENJPEG_2_3_CFLAGS=3D$pkg_cv_OPENJPEG_2_3_CFLAGS > ++ OPENJPEG_2_3_LIBS=3D$pkg_cv_OPENJPEG_2_3_LIBS > ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 > ++$as_echo "yes" >&6; } > ++ > ++ HAVE_OPENJPEG_2_3=3D"yes" > ++ > ++fi > ++ > ++ > ++ if test x"$HAVE_OPENJPEG_2_3" =3D x"yes"; then > ++ > ++$as_echo "#define HAVE_OPENJPEG_2_3 1" >>confdefs.h > ++ > ++ fi > + fi > + fi > + else > +--- ext/openjpeg/gstopenjpeg.h.orig 2017-08-17 10:39:18 UTC > ++++ ext/openjpeg/gstopenjpeg.h > +@@ -38,7 +38,9 @@ > + #define OPJ_CPRL CPRL > + #else > + #include <stdio.h> > +-# if defined(HAVE_OPENJPEG_2_2) > ++# if defined(HAVE_OPENJPEG_2_3) > ++# include <openjpeg-2.3/openjpeg.h> > ++# elif defined(HAVE_OPENJPEG_2_2) > + # include <openjpeg-2.2/openjpeg.h> > + # elif defined(HAVE_OPENJPEG_2_1) > + # include <openjpeg-2.1/openjpeg.h> > > Added: head/graphics/leptonica/files/patch-configure > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/graphics/leptonica/files/patch-configure Tue Oct 10 17:45:57 2= 017 (r451711) > @@ -0,0 +1,11 @@ > +--- configure.orig 2017-01-02 21:49:40 UTC > ++++ configure > +@@ -12929,7 +12929,7 @@ if test "x$ac_cv_lib_openjp2_opj_create_ > + $as_echo "#define HAVE_LIBJP2K 1" >>confdefs.h > + LIBJP2K_LIBS=3D-lopenjp2 > +=20 > +- for ac_header in openjpeg-2.2/openjpeg.h openjpeg-2.1/openjpeg.= h openjpeg-2.0/openjpeg.h > ++ for ac_header in openjpeg-2.3/openjpeg.h openjpeg-2.2/openjpeg.= h openjpeg-2.1/openjpeg.h openjpeg-2.0/openjpeg.h > + do : > + as_ac_Header=3D`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` > + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "= $ac_includes_default" > > Modified: head/graphics/mupdf/files/patch-source__fitz__load-jpx.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/graphics/mupdf/files/patch-source__fitz__load-jpx.c Tue Oct 10= 17:45:50 2017 (r451710) > +++ head/graphics/mupdf/files/patch-source__fitz__load-jpx.c Tue Oct 10= 17:45:57 2017 (r451711) > @@ -16,7 +16,7 @@ > #define USE_JPIP > =20 > -#include <openjpeg.h> > -+#include <openjpeg-2.2/openjpeg.h> > ++#include <openjpeg-2.3/openjpeg.h> > =20 > struct fz_jpxd_s > { > > Modified: head/graphics/openjpeg/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/graphics/openjpeg/Makefile Tue Oct 10 17:45:50 2017 (r451710) > +++ head/graphics/openjpeg/Makefile Tue Oct 10 17:45:57 2017 (r451711) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D openjpeg > -PORTVERSION=3D 2.2.0 > +PORTVERSION=3D 2.3.0 > DISTVERSIONPREFIX=3D v > CATEGORIES=3D graphics > =20 > > Modified: head/graphics/openjpeg/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/graphics/openjpeg/distinfo Tue Oct 10 17:45:50 2017 (r451710) > +++ head/graphics/openjpeg/distinfo Tue Oct 10 17:45:57 2017 (r451711) > @@ -1,3 +1,3 @@ > -TIMESTAMP =3D 1502573051 > -SHA256 (uclouvain-openjpeg-v2.2.0_GH0.tar.gz) =3D 6fddbce5a618e910e03a= d00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b > -SIZE (uclouvain-openjpeg-v2.2.0_GH0.tar.gz) =3D 2847582 > +TIMESTAMP =3D 1507191000 > +SHA256 (uclouvain-openjpeg-v2.3.0_GH0.tar.gz) =3D 3dc787c1bb6023ba846c= 2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a > +SIZE (uclouvain-openjpeg-v2.3.0_GH0.tar.gz) =3D 2207329 > > --=20 Mathieu Arnold --xsiKpqWRBNBiTXD95cVdAXU3VR2bejj3o-- --jlOf1OaOOEiQ0G27cdQV8f6ULaiTlUwd6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJZ3xm5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85I+ZQQAJoeVd8iX/plHviWmZO/Wkdc aPMf7ujQmNvRWXpIkGsROo1MAv1y3Or4OsDNRDY8m2Yr9f8hn63zmyainROY+veq ESFqcVS+CEOW7gZMoyDYhCOucdbHELpxwDbwAuiGsovACrIBp8oOIu5xYJPdan0/ XdMkCQPEChImFeij6RmlHoNb0H44WmkRJnu948/PNqKxuq9GeDXkUZewgfksx6nT OM0Y29IUsbaPsrglwZrMg8lp1TJq7CmcCaBktHZdBgybNDcRwslUPdsgeoziKy5n 32sME23QGDz99iS5HoCI5w2QQ2w4TczNdNhEwmKKPpVGSo5Gmwa1A4GSkq4nQpXl iXwx1JxqMolygfupEb8vppNp/7Bfb5qeKP9s0egvuUP22jco86XJyYlZ6iXHwnAY Qj1WLe9N/zEZkWYQ702liNxRMTYVN0qMdAcz1vAqy6G6zJl8nz0gmqgStdqaBc0s eNKyRGwUiiguhvYd+JNl+tHSWqfyX+VuSQc0uLGp0GcNorfkBswg66jpxz4uQS/z QcqT0zF1Btf+uQqRm1Pn179a8roUKurOSz+sHmpqr+swQOd5/7vhdIYVBvxPNHKc RgxshpoS/+0F/4lpjeg0dLYtNdpBlOa7FORTSxMDsm7Dtvjm2j84rkm/vqEI95gr nebNHZIOGezArvlQg5yb =jx0a -----END PGP SIGNATURE----- --jlOf1OaOOEiQ0G27cdQV8f6ULaiTlUwd6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aafb6fff-40f2-37a6-af68-6eb00edf5bca>