git: 35b0544d8e11 - main - graphics/libraw: Update to 0.21.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 02 Mar 2023 17:59:19 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=35b0544d8e1149aecec2ed3b81a67d6e64601cb7
commit 35b0544d8e1149aecec2ed3b81a67d6e64601cb7
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-03-02 17:50:49 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-03-02 17:59:13 +0000
graphics/libraw: Update to 0.21.1
Bump PORTREVISION on dependent ports due to shared library increase.
Add several fixes for compatability.
https://www.libraw.org/news/libraw-0-21-release
https://www.libraw.org/news/libraw-0-21-1-release
---
astro/kstars/Makefile | 1 +
devel/efl/Makefile | 2 +-
graphics/ImageMagick6/Makefile | 1 +
graphics/ImageMagick7/Makefile | 1 +
graphics/filmulator/Makefile | 1 +
graphics/gegl/Makefile | 1 +
graphics/gthumb/Makefile | 3 +++
graphics/gthumb/distinfo | 4 ++-
graphics/krita/Makefile | 2 +-
graphics/libkdcraw/Makefile | 1 +
graphics/libraw/Makefile | 31 ++++++++++------------
graphics/libraw/distinfo | 6 ++---
graphics/libraw/pkg-plist | 8 +++---
graphics/luminance-qt5/Makefile | 2 +-
graphics/nomacs/Makefile | 2 +-
graphics/openimageio/Makefile | 2 +-
graphics/oyranos/Makefile | 2 +-
graphics/oyranos/files/patch-CMakeLists.txt | 6 ++---
.../files/patch-src_API__generated_oyProfile__s.h | 10 +++++++
.../files/patch-src_API_generated_oyProfile_s.h | 10 -------
graphics/oyranos/files/patch-src_CMakeLists.txt | 6 ++---
...es_color_modules_devices_oyranos__cmm__oyRE.cpp | 15 ++++++++++-
graphics/photoqt/Makefile | 2 +-
...cplusplus_imageprovider_loader_loadimage__raw.h | 16 +++++++++++
multimedia/emby-server-devel/Makefile | 2 +-
multimedia/emby-server/Makefile | 2 +-
26 files changed, 88 insertions(+), 51 deletions(-)
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 44028d79e1c9..4b6abab12e08 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -1,5 +1,6 @@
PORTNAME= kstars
DISTVERSION= 3.6.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= astro kde
MASTER_SITES= KDE/stable/${PORTNAME}
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 9383c3772d1b..68fc710c8d98 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= efl
DISTVERSION= 1.26.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel enlightenment
MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/
DIST_SUBDIR= enlightenment
diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile
index 22c8591d1c49..7c83821d7dd3 100644
--- a/graphics/ImageMagick6/Makefile
+++ b/graphics/ImageMagick6/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ImageMagick
DISTVERSION= 6.9.12-77
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics perl5
MASTER_SITES= https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index cac483c82be0..1fc165860ecf 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ImageMagick
DISTVERSION= 7.1.0-62
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
https://mirror.dogado.de/imagemagick/releases/ \
diff --git a/graphics/filmulator/Makefile b/graphics/filmulator/Makefile
index 73958db359c4..a536c5e5e911 100644
--- a/graphics/filmulator/Makefile
+++ b/graphics/filmulator/Makefile
@@ -1,5 +1,6 @@
PORTNAME= filmulator
PORTVERSION= 0.11.1
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= graphics
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 88dfa2d1bb36..140811d6e6e1 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gegl
PORTVERSION= 0.4.42
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GIMP
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index d5d0fa6c5008..a31a5da057a7 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -5,6 +5,9 @@ CATEGORIES= graphics
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
+PATCH_SITES= https://gitlab.gnome.org/GNOME/gthumb/-/commit/
+PATCHFILES= 2133520496afd179702953a5d07aa99b5209f9cf.patch:-p1 #Fix build with libraw >= 0.21.0
+
MAINTAINER= gnome@FreeBSD.org
COMMENT= Image viewer and browser for the GNOME environment
WWW= https://wiki.gnome.org/Apps/gthumb/
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 542262abfbdc..84132352c484 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1656159852
+TIMESTAMP = 1677764827
SHA256 (gnome/gthumb-3.12.2.tar.xz) = 97f8afe522535216541ebbf1e3b546d12a6beb38a8f0eb85f26e676934aad425
SIZE (gnome/gthumb-3.12.2.tar.xz) = 7585700
+SHA256 (gnome/2133520496afd179702953a5d07aa99b5209f9cf.patch) = 96c82ad7390d3c39e421f1e0e6b129492f07dc9239d54791ed41713659dd496a
+SIZE (gnome/2133520496afd179702953a5d07aa99b5209f9cf.patch) = 2358
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 75ab5a299383..491c05e09600 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,6 +1,6 @@
PORTNAME= krita
DISTVERSION= 5.1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 8def6f675183..fd1ef96bdff3 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libkdcraw
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile
index 72499cd886b7..9701b96b65ea 100644
--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@@ -1,6 +1,5 @@
PORTNAME= libraw
-PORTVERSION= 0.20.2
-PORTREVISION= 3
+PORTVERSION= 0.21.1
CATEGORIES= graphics
MASTER_SITES= http://www.libraw.org/data/
DISTNAME= LibRaw-${PORTVERSION}
@@ -26,30 +25,28 @@ OPTIONS_DEFINE= DOCS EXAMPLES JASPER JPEG LCMS2 OPENMP OPTIMIZED_CFLAGS \
RPIRAW X3F
OPTIONS_DEFAULT= JPEG LCMS2
-JASPER_CONFIGURE_ENABLE= jasper
-JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper
+JASPER_CONFIGURE_ENABLE= jasper
+JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper
-JPEG_CONFIGURE_ENABLE= jpeg
-JPEG_USES= jpeg
+JPEG_CONFIGURE_ENABLE= jpeg
+JPEG_USES= jpeg
-LCMS2_CONFIGURE_ENABLE= lcms
-LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
+LCMS2_CONFIGURE_ENABLE= lcms
+LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
-OPENMP_DESC= OpenMP support (implies GCC)
-OPENMP_CONFIGURE_ENABLE= openmp
-OPENMP_LDFLAGS+= -lomp
+OPENMP_CONFIGURE_ENABLE= openmp
+OPENMP_LDFLAGS= -lomp
-RPIRAW_DESC= Raspberry Pi RAW+JPEG support
-RPIRAW_CPPFLAGS= -DUSE_6BY9RPI
+RPIRAW_DESC= Raspberry Pi RAW+JPEG support
+RPIRAW_CPPFLAGS= -DUSE_6BY9RPI
-X3F_DESC= X3F (Foveon) support
-X3F_CPPFLAGS= -DUSE_X3FTOOLS
+X3F_DESC= X3F (Foveon) support
+X3F_CPPFLAGS= -DUSE_X3FTOOLS
-OPTIMIZED_CFLAGS_CFLAGS= -O3
+OPTIMIZED_CFLAGS_CFLAGS= -O3
post-patch:
@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/*.pc.in
- @${TOUCH} -r ${WRKSRC}/configure.ac ${WRKSRC}/aclocal.m4
# Use "\*" instead of "." in COPYTREE_SHARE commands as "." has
# the undesired effect of copying ".deps" directory
diff --git a/graphics/libraw/distinfo b/graphics/libraw/distinfo
index 2bfaeab695e3..c386a5667588 100644
--- a/graphics/libraw/distinfo
+++ b/graphics/libraw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604028382
-SHA256 (LibRaw-0.20.2.tar.gz) = dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6
-SIZE (LibRaw-0.20.2.tar.gz) = 1432141
+TIMESTAMP = 1677636265
+SHA256 (LibRaw-0.21.1.tar.gz) = 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd
+SIZE (LibRaw-0.21.1.tar.gz) = 1638461
diff --git a/graphics/libraw/pkg-plist b/graphics/libraw/pkg-plist
index 94d6d6cfd79e..6d261932a558 100644
--- a/graphics/libraw/pkg-plist
+++ b/graphics/libraw/pkg-plist
@@ -7,11 +7,11 @@ include/libraw/libraw_types.h
include/libraw/libraw_version.h
lib/libraw.a
lib/libraw.so
-lib/libraw.so.20
-lib/libraw.so.20.0.0
+lib/libraw.so.23
+lib/libraw.so.23.0.0
lib/libraw_r.a
lib/libraw_r.so
-lib/libraw_r.so.20
-lib/libraw_r.so.20.0.0
+lib/libraw_r.so.23
+lib/libraw_r.so.23.0.0
libdata/pkgconfig/libraw.pc
libdata/pkgconfig/libraw_r.pc
diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index 9cb3bbce1883..90fd13d1d628 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -1,6 +1,6 @@
PORTNAME= luminance-hdr
DISTVERSION= 2.6.1.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index 8c42c56578e3..571a4f45fd27 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= nomacs
PORTVERSION= 3.16
DISTVERSIONSUFFIX= .224
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
PATCH_SITES= https://github.com/nomacs/nomacs/commit/
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index fc1cf5043460..38c9e08d3f7e 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -5,7 +5,7 @@ DISTVERSION= 2.4.4.2
# py-openimageio's PORTREVISION.
# Also, just to be on the safe side, when resetting,
# best keep PORTREVISION?= 0.
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES?= graphics multimedia
MAINTAINER?= FreeBSD@Shaneware.biz
diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index dbfdd7bb6e64..b165a7dce92d 100644
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@@ -1,6 +1,6 @@
PORTNAME= oyranos
PORTVERSION= 0.9.6
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/oyranos/files/patch-CMakeLists.txt b/graphics/oyranos/files/patch-CMakeLists.txt
index c60668d2cb9c..16ad373e569b 100644
--- a/graphics/oyranos/files/patch-CMakeLists.txt
+++ b/graphics/oyranos/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2016-12-09 13:36:53.000000000 +0300
-+++ CMakeLists.txt 2016-12-26 17:57:38.831330000 +0300
-@@ -66,6 +66,10 @@
+--- CMakeLists.txt.orig 2016-12-09 10:36:53 UTC
++++ CMakeLists.txt
+@@ -66,6 +66,10 @@ ENDIF(UNIX)
ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
ENDIF(UNIX)
diff --git a/graphics/oyranos/files/patch-src_API__generated_oyProfile__s.h b/graphics/oyranos/files/patch-src_API__generated_oyProfile__s.h
new file mode 100644
index 000000000000..87681f96294f
--- /dev/null
+++ b/graphics/oyranos/files/patch-src_API__generated_oyProfile__s.h
@@ -0,0 +1,10 @@
+--- src/API_generated/oyProfile_s.h.orig 2016-12-09 10:36:53 UTC
++++ src/API_generated/oyProfile_s.h
+@@ -30,6 +30,7 @@
+
+
+
++#include <inttypes.h>
+ #include <icc34.h>
+
+ #include <oyranos_object.h>
diff --git a/graphics/oyranos/files/patch-src_API_generated_oyProfile_s.h b/graphics/oyranos/files/patch-src_API_generated_oyProfile_s.h
deleted file mode 100644
index 4a65cf59badd..000000000000
--- a/graphics/oyranos/files/patch-src_API_generated_oyProfile_s.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/API_generated/oyProfile_s.h.orig 2013-01-19 14:14:14.000000000 +0400
-+++ src/API_generated/oyProfile_s.h 2013-04-30 18:50:50.999894240 +0400
-@@ -31,6 +31,7 @@
-
-
-
-+#include <inttypes.h>
- #include <icc34.h>
-
- #include <oyranos_object.h>
diff --git a/graphics/oyranos/files/patch-src_CMakeLists.txt b/graphics/oyranos/files/patch-src_CMakeLists.txt
index 2c19eb86f24c..c7726e1b853b 100644
--- a/graphics/oyranos/files/patch-src_CMakeLists.txt
+++ b/graphics/oyranos/files/patch-src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig 2016-12-09 13:36:53.000000000 +0300
-+++ src/CMakeLists.txt 2016-12-24 23:59:33.793724000 +0300
-@@ -63,7 +63,6 @@
+--- src/CMakeLists.txt.orig 2016-12-09 10:36:53 UTC
++++ src/CMakeLists.txt
+@@ -63,7 +63,6 @@ ELSE(HAVE_DL)
FIND_PATH(DL_INCLUDE_DIR dlfcn.h)
IF(DL_INCLUDE_DIR)
SET( HAVE_DL 1 )
diff --git a/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranos__cmm__oyRE.cpp b/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranos__cmm__oyRE.cpp
index 81871331569e..4f5b51d8d688 100644
--- a/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranos__cmm__oyRE.cpp
+++ b/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranos__cmm__oyRE.cpp
@@ -1,4 +1,8 @@
---- src/modules/color/modules/devices/oyranos_cmm_oyRE.cpp.orig 2018-01-15 20:16:42 UTC
+Chunk 2: Fix build with libraw >= 0.21.0
+Based on upstream commit:
+https://gitlab.com/oyranos/oyranos/-/commit/7fd1eabdf9f59727c0f516d33663d895f812a449
+
+--- src/modules/color/modules/devices/oyranos_cmm_oyRE.cpp.orig 2016-12-09 10:36:53 UTC
+++ src/modules/color/modules/devices/oyranos_cmm_oyRE.cpp
@@ -482,7 +482,7 @@ oyProfile_s * createMatrixProfile ( libraw_colord
oyOptions_s * result = 0;
@@ -9,3 +13,12 @@
oyOptions_Handle( reg, opts, "create_profile.icc_profile.color_matrix",
&result );
+@@ -1447,7 +1447,7 @@ int DeviceFromContext(oyConfig_s **config, libraw_outp
+ DFC_OPT_ADD_INT_ARR(greybox,1) //4
+ DFC_OPT_ADD_INT_ARR(greybox,2) //4
+ DFC_OPT_ADD_INT_ARR(greybox,3) //4
+- DFC_OPT_ADD_INT(shot_select)
++ //DFC_OPT_ADD_INT(shot_select)
+
+ return error;
+ }
diff --git a/graphics/photoqt/Makefile b/graphics/photoqt/Makefile
index 5998817aaa14..de9a7d4e2852 100644
--- a/graphics/photoqt/Makefile
+++ b/graphics/photoqt/Makefile
@@ -1,7 +1,7 @@
PORTNAME= photoqt
DISTVERSIONPREFIX= v
DISTVERSION= 1.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MAINTAINER= melanhit@gmail.com
diff --git a/graphics/photoqt/files/patch-cplusplus_imageprovider_loader_loadimage__raw.h b/graphics/photoqt/files/patch-cplusplus_imageprovider_loader_loadimage__raw.h
new file mode 100644
index 000000000000..7cdd88ff11c6
--- /dev/null
+++ b/graphics/photoqt/files/patch-cplusplus_imageprovider_loader_loadimage__raw.h
@@ -0,0 +1,16 @@
+Fix build with libraw >= 0.21.0
+
+--- cplusplus/imageprovider/loader/loadimage_raw.h.orig 2023-03-02 16:52:09 UTC
++++ cplusplus/imageprovider/loader/loadimage_raw.h
+@@ -56,7 +56,11 @@ class LoadImageRaw { (public)
+ // Since we don't care about manipulating RAW images but only want to display
+ // them, we can optimise for speed
+ raw.imgdata.params.user_qual = 2;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++ raw.imgdata.rawparams.use_rawspeed = 1;
++#else
+ raw.imgdata.params.use_rawspeed = 1;
++#endif
+ raw.imgdata.params.use_camera_wb = 1;
+
+ // Open the RAW image
diff --git a/multimedia/emby-server-devel/Makefile b/multimedia/emby-server-devel/Makefile
index 6cadc2a87711..a8d34ea4837a 100644
--- a/multimedia/emby-server-devel/Makefile
+++ b/multimedia/emby-server-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= emby-server
DISTVERSION= 4.8.0.21
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \
https://mediabrowser.github.io/embytools/
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index 006ec73d3942..b8e7dcea8b37 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME= emby-server
DISTVERSION= 4.7.11.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \
https://mediabrowser.github.io/embytools/