Re: UPDATE: graphics/libraw and friends

2023-01-01 Thread Rafael Sadowski 
On Sat Dec 24, 2022 at 01:44:06PM +0100, Rafael Sadowski wrote:
> Please find below a Christmas diff to update libraw. As usually upstream
> has broken ABI.
> 
>  - Update libraw to 0.21.0
>   - Changelog: https://www.libraw.org/news/libraw-0-21-release
>  - fix gegl04, gthumb, krita and libkdcraw with patches from upstream.
>Maintainer CC'ed.
>  - Rename swap24 and swap32 to unbreak the build
> 
> OK, Comments?

Any comments, any concerns?

> 
> Rafael
> 
> 
> Index: graphics/gegl04/Makefile
> ===
> RCS file: /cvs/ports/graphics/gegl04/Makefile,v
> retrieving revision 1.36
> diff -u -p -u -p -r1.36 Makefile
> --- graphics/gegl04/Makefile  14 Nov 2022 08:03:34 -  1.36
> +++ graphics/gegl04/Makefile  24 Dec 2022 12:34:05 -
> @@ -4,6 +4,7 @@ V=0.4.40
>  DISTNAME=gegl-${V}
>  PKGNAME= gegl04-${V}
>  EXTRACT_SUFX=.tar.xz
> +REVISION=0
>  
>  SHARED_LIBS += gegl-0.4  0.5 # 0.439.1
>  
> Index: graphics/gegl04/patches/patch-operations_external_raw-load_c
> ===
> RCS file: graphics/gegl04/patches/patch-operations_external_raw-load_c
> diff -N graphics/gegl04/patches/patch-operations_external_raw-load_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ graphics/gegl04/patches/patch-operations_external_raw-load_c  24 Dec 
> 2022 12:34:05 -
> @@ -0,0 +1,17 @@
> +https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/133
> +Index: operations/external/raw-load.c
> +--- operations/external/raw-load.c.orig
>  operations/external/raw-load.c
> +@@ -114,8 +114,12 @@ prepare (GeglOperation *operation)
> + g_warning ("raw-load: Error Initializing raw library");
> +   else
> + {
> ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
> ++  p->LibRaw->rawparams.shot_select = o->image_num;
> ++#else
> +   p->LibRaw->params.shot_select = o->image_num;
> + 
> ++#endif
> +   p->LibRaw->params.aber[0] = 1.0;
> +   p->LibRaw->params.aber[2] = 1.0;
> +   //p->LibRaw->params.gamm[0] = 1.0 / 2.4;
> Index: graphics/gthumb/Makefile
> ===
> RCS file: /cvs/ports/graphics/gthumb/Makefile,v
> retrieving revision 1.129
> diff -u -p -u -p -r1.129 Makefile
> --- graphics/gthumb/Makefile  4 Nov 2022 09:14:23 -   1.129
> +++ graphics/gthumb/Makefile  24 Dec 2022 12:34:05 -
> @@ -2,7 +2,7 @@ COMMENT=  image viewer and browser for GN
>  
>  GNOME_PROJECT=   gthumb
>  GNOME_VERSION=   3.12.2
> -REVISION=1
> +REVISION=2
>  
>  CATEGORIES=  graphics
>  
> Index: 
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
> ===
> RCS file: 
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
> diff -N 
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
> 24 Dec 2022 12:34:05 -
> @@ -0,0 +1,13 @@
> +https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec
> +Index: extensions/raw_files/gth-metadata-provider-raw.c
> +--- extensions/raw_files/gth-metadata-provider-raw.c.orig
>  extensions/raw_files/gth-metadata-provider-raw.c
> +@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *s
> + if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
> + return;
> + 
> +-raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | 
> LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
> ++raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
> + if (raw_data == NULL)
> + goto fatal_error;
> + 
> Index: 
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
> ===
> RCS file: 
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
> diff -N 
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 
> graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
> 24 Dec 2022 12:34:05 -
> @@ -0,0 +1,18 @@
> +https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec
> +Index: extensions/raw_files/gth-metadata-provider-raw.h
> +--- extensions/raw_files/gth-metadata-provider-raw.h.orig
>  extensions/raw_files/gth-metadata-provider-raw.h
> +@@ -25,6 +25,13 @@
> + #include 
> + #include 
> + #include 
> ++#include 
> ++
> ++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
> ++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK)
> ++#else
> ++#define

UPDATE: graphics/libraw and friends

2022-12-24 Thread Rafael Sadowski 
Please find below a Christmas diff to update libraw. As usually upstream
has broken ABI.

 - Update libraw to 0.21.0
  - Changelog: https://www.libraw.org/news/libraw-0-21-release
 - fix gegl04, gthumb, krita and libkdcraw with patches from upstream.
   Maintainer CC'ed.
 - Rename swap24 and swap32 to unbreak the build

OK, Comments?

Rafael


Index: graphics/gegl04/Makefile
===
RCS file: /cvs/ports/graphics/gegl04/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- graphics/gegl04/Makefile14 Nov 2022 08:03:34 -  1.36
+++ graphics/gegl04/Makefile24 Dec 2022 12:34:05 -
@@ -4,6 +4,7 @@ V=  0.4.40
 DISTNAME=  gegl-${V}
 PKGNAME=   gegl04-${V}
 EXTRACT_SUFX=  .tar.xz
+REVISION=  0
 
 SHARED_LIBS += gegl-0.4  0.5 # 0.439.1
 
Index: graphics/gegl04/patches/patch-operations_external_raw-load_c
===
RCS file: graphics/gegl04/patches/patch-operations_external_raw-load_c
diff -N graphics/gegl04/patches/patch-operations_external_raw-load_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ graphics/gegl04/patches/patch-operations_external_raw-load_c24 Dec 
2022 12:34:05 -
@@ -0,0 +1,17 @@
+https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/133
+Index: operations/external/raw-load.c
+--- operations/external/raw-load.c.orig
 operations/external/raw-load.c
+@@ -114,8 +114,12 @@ prepare (GeglOperation *operation)
+ g_warning ("raw-load: Error Initializing raw library");
+   else
+ {
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++  p->LibRaw->rawparams.shot_select = o->image_num;
++#else
+   p->LibRaw->params.shot_select = o->image_num;
+ 
++#endif
+   p->LibRaw->params.aber[0] = 1.0;
+   p->LibRaw->params.aber[2] = 1.0;
+   //p->LibRaw->params.gamm[0] = 1.0 / 2.4;
Index: graphics/gthumb/Makefile
===
RCS file: /cvs/ports/graphics/gthumb/Makefile,v
retrieving revision 1.129
diff -u -p -u -p -r1.129 Makefile
--- graphics/gthumb/Makefile4 Nov 2022 09:14:23 -   1.129
+++ graphics/gthumb/Makefile24 Dec 2022 12:34:05 -
@@ -2,7 +2,7 @@ COMMENT=image viewer and browser for GN
 
 GNOME_PROJECT= gthumb
 GNOME_VERSION= 3.12.2
-REVISION=  1
+REVISION=  2
 
 CATEGORIES=graphics
 
Index: 
graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
===
RCS file: 
graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
diff -N 
graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 
graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c  
24 Dec 2022 12:34:05 -
@@ -0,0 +1,13 @@
+https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec
+Index: extensions/raw_files/gth-metadata-provider-raw.c
+--- extensions/raw_files/gth-metadata-provider-raw.c.orig
 extensions/raw_files/gth-metadata-provider-raw.c
+@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *s
+   if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
+   return;
+ 
+-  raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | 
LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
++  raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS);
+   if (raw_data == NULL)
+   goto fatal_error;
+ 
Index: 
graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
===
RCS file: 
graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
diff -N 
graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 
graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h  
24 Dec 2022 12:34:05 -
@@ -0,0 +1,18 @@
+https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec
+Index: extensions/raw_files/gth-metadata-provider-raw.h
+--- extensions/raw_files/gth-metadata-provider-raw.h.orig
 extensions/raw_files/gth-metadata-provider-raw.h
+@@ -25,6 +25,13 @@
+ #include 
+ #include 
+ #include 
++#include 
++
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK)
++#else
++#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | 
LIBRAW_OPIONS_NO_DATAERR_CALLBACK)
++#endif
+ 
+ #define GTH_TYPE_METADATA_PROVIDER_RAW 
(gth_metadata_provider_raw_get_type ())
+ #define GTH_METADATA_PROVIDER_RAW(o)   (G_TYPE_CHECK_INSTANCE_CAST 
((o), GTH_TYPE_METADATA_PROVIDER_RAW,

UPDATE: graphics/libraw

2020-08-17 Thread Rafael Sadowski 
Update libraw to the latest stable version 0.20. Chnagelog:

https://www.libraw.org/news/libraw-0-20-Release


Only added exports in dynamic. Some exports removed in PLT, but which
does not lead to BUMP major, correct?

Tested with Digikam 7.0. OK?

Rafael

Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile10 Jan 2020 11:19:33 -  1.44
+++ Makefile18 Aug 2020 04:53:54 -
@@ -2,13 +2,12 @@
 
 COMMENT =  library for reading RAW files
 
-DISTNAME = LibRaw-0.19.5
+DISTNAME = LibRaw-0.20.0
 PKGNAME =  ${DISTNAME:L}
-REVISION = 0
 CATEGORIES =   graphics
 
-SHARED_LIBS +=  raw  4.0  # 15.0
-SHARED_LIBS +=  raw_r4.0  # 15.0
+SHARED_LIBS +=  raw  4.1  # 15.0
+SHARED_LIBS +=  raw_r4.1  # 15.0
 
 HOMEPAGE = https://www.libraw.org/
 
@@ -17,7 +16,7 @@ MAINTAINER =  Rafael Sadowski https://www.libraw.org/data/
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- distinfo5 Sep 2019 16:20:25 -   1.16
+++ distinfo18 Aug 2020 04:53:54 -
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.19.5.tar.gz) = QKJi18xxcCcRoPrsEGEY7gBPhshswigoHRLRbaA+AvU=
-SIZE (LibRaw-0.19.5.tar.gz) = 1303806
+SHA256 (LibRaw-0.20.0.tar.gz) = Hwo4PaLOn0CQh/rNKCYd7L9r5yzJDHjNADsHZuTWlKM=
+SIZE (LibRaw-0.20.0.tar.gz) = 1431412
Index: patches/patch-internal_dcraw_common_cpp
===
RCS file: patches/patch-internal_dcraw_common_cpp
diff -N patches/patch-internal_dcraw_common_cpp
--- patches/patch-internal_dcraw_common_cpp 5 Sep 2019 16:20:25 -   
1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-internal_dcraw_common_cpp,v 1.4 2019/09/05 16:20:25 rsadowski 
Exp $
-
-OpenBSD has its own strnlen and strcasestr.
-
-Index: internal/dcraw_common.cpp
 internal/dcraw_common.cpp.orig
-+++ internal/dcraw_common.cpp
-@@ -46,7 +46,7 @@ int CLASS fcol(int row, int col)
-   return FC(row, col);
- }
- 
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) || !defined(__OpenBSD__)
- static size_t local_strnlen(const char *s, size_t n)
- {
-   const char *p = (const char *)memchr(s, 0, n);
-@@ -130,7 +130,7 @@ static int stread(char *buf, size_t len, LibRaw_abstra
- #define stmread(buf, maxlen, fp) stread(buf, MIN(maxlen, sizeof(buf)), fp)
- #endif
- 
--#if !defined(__GLIBC__) && !defined(__FreeBSD__)
-+#if !defined(__GLIBC__) && (!defined(__FreeBSD__) || !defined(__OpenBSD__))
- char *my_memmem(char *haystack, size_t haystacklen, char *needle, size_t 
needlelen)
- {
-   char *c;
Index: patches/patch-libraw_pc_in
===
RCS file: /cvs/ports/graphics/libraw/patches/patch-libraw_pc_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-libraw_pc_in
--- patches/patch-libraw_pc_in  10 Jan 2020 11:19:33 -  1.2
+++ patches/patch-libraw_pc_in  18 Aug 2020 04:53:54 -
@@ -11,4 +11,4 @@ Index: libraw.pc.in
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
 +Libs: -L${libdir} -lraw@PC_OPENMP@
- Cflags: -I${includedir}/libraw
+ Cflags: -I${includedir}/libraw -I${includedir}
Index: patches/patch-libraw_r_pc_in
===
RCS file: /cvs/ports/graphics/libraw/patches/patch-libraw_r_pc_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-libraw_r_pc_in
--- patches/patch-libraw_r_pc_in10 Jan 2020 11:19:33 -  1.1
+++ patches/patch-libraw_r_pc_in18 Aug 2020 04:53:54 -
@@ -11,4 +11,4 @@ Index: libraw_r.pc.in
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
 +Libs: -L${libdir} -lraw_r@PC_OPENMP@
- Cflags: -I${includedir}/libraw
+ Cflags: -I${includedir}/libraw -I${includedir}
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/libraw/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   3 Jul 2017 17:29:06 -   1.6
+++ pkg/PLIST   18 Aug 2020 04:53:54 -
@@ -7,6 +7,7 @@
 @bin bin/multirender_test
 @bin bin/postprocessing_benchmark
 @bin bin/raw-identify
+@bin bin/rawtextdump
 @bin bin/simple_dcraw
 @bin bin/unprocessed_raw
 include/libraw/
@@ -17,10 +18,10 @@ include/libraw/libraw_datastream.h
 include/libraw/libraw_internal.h
 include/libraw/libraw_types.h
 include/libraw/libraw_version.h
-lib/libraw.a
+@static-lib lib/libraw.a
 lib/libraw.la
 @lib lib/libraw.so.${LIBraw_VERSION}
-lib/libraw_r.a
+@static-lib lib/libraw_r.a
 lib/libraw_r.la
 @lib lib/libraw_r.so.${LIBraw_r_VERSION}

UPDATE: graphics/libraw

2019-08-25 Thread Rafael Sadowski 
Simple update to the latest stable version. All consumer build fine on
amd64. I did a quick runtime test with nomacs which a CR2 file from
sthen@. No issues, no seg faults.

OK?

RS


Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile12 Jul 2019 20:47:02 -  1.42
+++ Makefile25 Aug 2019 16:19:10 -
@@ -2,13 +2,12 @@
 
 COMMENT =  library for reading RAW files
 
-DISTNAME = LibRaw-0.18.13
-REVISION = 1
+DISTNAME = LibRaw-0.19.5
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   graphics
 
-SHARED_LIBS +=  raw  3.2  # 15.0
-SHARED_LIBS +=  raw_r3.2  # 15.0
+SHARED_LIBS +=  raw  4.0  # 15.0
+SHARED_LIBS +=  raw_r4.0  # 15.0
 
 HOMEPAGE = https://www.libraw.org/
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo1 Jul 2018 11:44:15 -   1.15
+++ distinfo25 Aug 2019 16:19:10 -
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.18.13.tar.gz) = yx+dDR+ryJZ9UB2VwF0rU9l6K5FzRcZlU7GrvqBnV8o=
-SIZE (LibRaw-0.18.13.tar.gz) = 1287631
+SHA256 (LibRaw-0.19.5.tar.gz) = QKJi18xxcCcRoPrsEGEY7gBPhshswigoHRLRbaA+AvU=
+SIZE (LibRaw-0.19.5.tar.gz) = 1303806
Index: patches/patch-internal_dcraw_common_cpp
===
RCS file: /cvs/ports/graphics/libraw/patches/patch-internal_dcraw_common_cpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-internal_dcraw_common_cpp
--- patches/patch-internal_dcraw_common_cpp 27 Mar 2019 23:29:06 -  
1.3
+++ patches/patch-internal_dcraw_common_cpp 25 Aug 2019 16:19:10 -
@@ -5,28 +5,21 @@ OpenBSD has its own strnlen and strcases
 Index: internal/dcraw_common.cpp
 --- internal/dcraw_common.cpp.orig
 +++ internal/dcraw_common.cpp
-@@ -51,6 +51,7 @@ int CLASS fcol (int row, int col)
-   if (filters == 9) return xtrans[(row+6) % 6][(col+6) % 6];
-   return FC(row,col);
+@@ -46,7 +46,7 @@ int CLASS fcol(int row, int col)
+   return FC(row, col);
  }
-+#if !defined(__OpenBSD__)
+ 
+-#if !defined(__FreeBSD__)
++#if !defined(__FreeBSD__) || !defined(__OpenBSD__)
  static size_t local_strnlen(const char *s, size_t n)
  {
const char *p = (const char *)memchr(s, 0, n);
-@@ -58,6 +59,7 @@ static size_t local_strnlen(const char *s, size_t n)
- }
- /* add OS X version check here ?? */
- #define strnlen(a,b) local_strnlen(a,b)
-+#endif
- 
- #ifdef LIBRAW_LIBRARY_BUILD
- static int stread(char *buf, size_t len, LibRaw_abstract_datastream *fp)
-@@ -74,7 +76,7 @@ static int stread(char *buf, size_t len, LibRaw_abstra
- #define stmread(buf,maxlen,fp) stread(buf,MIN(maxlen,sizeof(buf)),fp)
+@@ -130,7 +130,7 @@ static int stread(char *buf, size_t len, LibRaw_abstra
+ #define stmread(buf, maxlen, fp) stread(buf, MIN(maxlen, sizeof(buf)), fp)
  #endif
  
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) && !defined(__OpenBSD__)
- char *my_memmem (char *haystack, size_t haystacklen,
- char *needle, size_t needlelen)
+-#if !defined(__GLIBC__) && !defined(__FreeBSD__)
++#if !defined(__GLIBC__) && (!defined(__FreeBSD__) || !defined(__OpenBSD__))
+ char *my_memmem(char *haystack, size_t haystacklen, char *needle, size_t 
needlelen)
  {
+   char *c;
Index: patches/patch-internal_libraw_x3f_cpp
===
RCS file: patches/patch-internal_libraw_x3f_cpp
diff -N patches/patch-internal_libraw_x3f_cpp
--- patches/patch-internal_libraw_x3f_cpp   27 Mar 2019 23:29:06 -  
1.7
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-internal_libraw_x3f_cpp,v 1.7 2019/03/27 23:29:06 ajacoutot 
Exp $
-
-fix non-constant-expression cannot be narrowed from type 'int' to 'int16_t'
-(aka 'short') with clang6
-
-Index: internal/libraw_x3f.cpp
 internal/libraw_x3f.cpp.orig
-+++ internal/libraw_x3f.cpp
-@@ -1398,7 +1398,9 @@ static void huffman_decode_row(x3f_info_t *I,
-   x3f_image_data_t *ID = >data_subsection.image_data;
-   x3f_huffman_t *HUF = ID->huffman;
- 
--  int16_t c[3] = {offset,offset,offset};
-+  int16_t off16 = static_cast(offset);
-+
-+  int16_t c[3] = {off16, off16, off16};
-   int col;
-   bit_state_t BS;
-

UPDATE: graphics/libraw to disable OpenMP

2019-06-23 Thread j 
Ongoing hunt for OpenMP enabled by default.


Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile27 Mar 2019 23:29:06 -  1.41
+++ Makefile23 Jun 2019 16:42:07 -
@@ -28,6 +28,7 @@ LIB_DEPENDS = graphics/jasper \
 
 SEPARATE_BUILD =   Yes
 CONFIGURE_STYLE =  gnu
+CONFIGURE_ARGS =   --disable-openmp
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

UPDATE: graphics/libraw

2018-09-20 Thread Rafael Sadowski 
Hi All,

Simple update to the latest stable version. The diff below includes
fixes for krita and libkdcraw KDE4/5 from upstream.

OK?

Index: graphics/krita/Makefile
===
RCS file: /cvs/ports/graphics/krita/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- graphics/krita/Makefile 19 Jul 2018 19:43:11 -  1.14
+++ graphics/krita/Makefile 20 Sep 2018 16:10:19 -
@@ -4,6 +4,7 @@ COMMENT =   advanced drawing and image man
 
 VERSION =  4.1.1
 DISTNAME = krita-${VERSION}
+REVISION = 0
 
 SHARED_LIBS +=  kritabasicflakes  1.0 # 16.0
 SHARED_LIBS +=  kritacolord   1.0 # 16.0
Index: 
graphics/krita/patches/patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_p_cpp
===
RCS file: 
graphics/krita/patches/patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_p_cpp
diff -N 
graphics/krita/patches/patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_p_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 
graphics/krita/patches/patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_p_cpp
  20 Sep 2018 16:10:19 -
@@ -0,0 +1,57 @@
+$OpenBSD$
+
+Fix build with libraw-0.19
+
+Index: plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+--- plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp.orig
 plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,40 +375,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi
+ raw.imgdata.params.fbdd_noiserd = 
lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
+ break;
+ }
+-case RawDecodingSettings::LINENR:
+-{
+-// (100 - 1000) => (0.001 - 0.02) conversion.
+-raw.imgdata.params.linenoise= 
m_parent->m_rawDecodingSettings.NRThreshold * 2.11E-5 + 0.0011;
+-raw.imgdata.params.cfaline  = true;
+-break;
+-}
+-
+-case RawDecodingSettings::IMPULSENR:
+-{
+-// (100 - 1000) => (0.005 - 0.05) conversion.
+-raw.imgdata.params.lclean   = 
m_parent->m_rawDecodingSettings.NRThreshold * 5E-5;
+-raw.imgdata.params.cclean   = 
m_parent->m_rawDecodingSettings.NRChroThreshold * 5E-5;
+-raw.imgdata.params.cfa_clean= true;
+-break;
+-}
+ default:   // No Noise Reduction
+ {
+ raw.imgdata.params.threshold= 0;
+ raw.imgdata.params.fbdd_noiserd = 0;
+-raw.imgdata.params.linenoise= 0;
+-raw.imgdata.params.cfaline  = false;
+-raw.imgdata.params.lclean   = 0;
+-raw.imgdata.params.cclean   = 0;
+-raw.imgdata.params.cfa_clean= false;
+ break;
+ }
+ }
+ 
+-// Chromatic aberration correction.
+-raw.imgdata.params.ca_correc  = 
m_parent->m_rawDecodingSettings.enableCACorrection;
+-raw.imgdata.params.cared  = 
m_parent->m_rawDecodingSettings.caMultiplier[0];
+-raw.imgdata.params.cablue = 
m_parent->m_rawDecodingSettings.caMultiplier[1];
+-
+ // Exposure Correction before interpolation.
+ raw.imgdata.params.exp_correc = 
m_parent->m_rawDecodingSettings.expoCorrection;
+ raw.imgdata.params.exp_shift  = 
m_parent->m_rawDecodingSettings.expoCorrectionShift;
+@@ -461,8 +435,6 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi
+ 
+ raw.imgdata.params.dcb_iterations = 
m_parent->m_rawDecodingSettings.dcbIterations;
+ raw.imgdata.params.dcb_enhance_fl = 
m_parent->m_rawDecodingSettings.dcbEnhanceFl;
+-raw.imgdata.params.eeci_refine= 
m_parent->m_rawDecodingSettings.eeciRefine;
+-raw.imgdata.params.es_med_passes  = 
m_parent->m_rawDecodingSettings.esMedPasses;
+ 
+ 
//---
+ 
Index: graphics/libraw/Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 Makefile
--- graphics/libraw/Makefile1 Jul 2018 11:44:15 -   1.39
+++ graphics/libraw/Makefile20 Sep 2018 16:10:19 -
@@ -2,12 +2,12 @@
 
 COMMENT =  library for reading RAW files
 
-DISTNAME = LibRaw-0.18.13
+DISTNAME = LibRaw-0.19.0
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   graphics
 
-SHARED_LIBS +=  raw  3.2  # 15.0
-SHARED_LIBS +=  raw_r3.2  # 15.0
+SHARED_LIBS +=  raw  4.0  # 15.0
+SHARED_LIBS +=  raw_r4.0  # 15.0
 
 HOMEPAGE = https://www.libraw.org/
 
Index: graphics/libraw/distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15

Re: UPDATE: graphics/libraw

2018-05-09 Thread Stuart Henderson 
On 2018/05/09 17:28, Rafael Sadowski wrote:
> Simple update to the latest stable version including:
> 
> CVE-2018-10529 fixed: out of bounds read in X3F parser
> CVE-2018-10528 fixed: possible stack overrun in X3F parser
> 
> 
> Upstream removed own License:
> https://www.libraw.org/news/libraw-0-18-released
> 
> A bulk would be really nice, anyone?

I don't see a need for that, or for the major bump, the function signature
of utf2char() did change but it was previously a static function so nothing
outside libraw itself could have used it. (And with the security fixes we
may want it in -stable where a major bump is a real headache).

> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/libraw/Makefile,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 Makefile
> --- Makefile  5 Mar 2018 14:53:40 -   1.35
> +++ Makefile  9 May 2018 15:23:21 -
> @@ -2,18 +2,18 @@
>  
>  COMMENT =library for reading RAW files
>  
> -DISTNAME =   LibRaw-0.18.8
> +DISTNAME =   LibRaw-0.18.10
>  PKGNAME =${DISTNAME:L}
>  CATEGORIES = graphics
>  
> -SHARED_LIBS +=  raw  3.0  # 15.0
> -SHARED_LIBS +=  raw_r3.0  # 15.0
> +SHARED_LIBS +=  raw  4.0  # 15.0
> +SHARED_LIBS +=  raw_r4.0  # 15.0

Change to just minor bumps, then it's OK sthen@.

>  
>  HOMEPAGE =   https://www.libraw.org/
>  
>  MAINTAINER = Rafael Sadowski 
>  
> -# LGPL v2.1 OR CDDL v1.0 OR their own
> +# LGPL v2.1 OR CDDL v1.0
>  PERMIT_PACKAGE_CDROM =   Yes
>  
>  WANTLIB += c jasper jpeg lcms2 m pthread ${COMPILER_LIBCXX}
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/libraw/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- distinfo  5 Mar 2018 14:53:40 -   1.11
> +++ distinfo  9 May 2018 15:23:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (LibRaw-0.18.8.tar.gz) = Vqyk/ZcDiSPVfS0X2QqhHYJ/Hz0/HZfp9aDVL/h0IOI=
> -SIZE (LibRaw-0.18.8.tar.gz) = 1281773
> +SHA256 (LibRaw-0.18.10.tar.gz) = CMm78rtfiuzng9BeC1Joqq5VYqNNlA4X7noiy8L7mU4=
> +SIZE (LibRaw-0.18.10.tar.gz) = 1282206
> Index: patches/patch-internal_libraw_x3f_cpp
> ===
> RCS file: /cvs/ports/graphics/libraw/patches/patch-internal_libraw_x3f_cpp,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-internal_libraw_x3f_cpp
> --- patches/patch-internal_libraw_x3f_cpp 7 Apr 2018 11:05:22 -   
> 1.4
> +++ patches/patch-internal_libraw_x3f_cpp 9 May 2018 15:23:21 -
> @@ -5,7 +5,7 @@ fix non-constant-expression cannot be na
>  Index: internal/libraw_x3f.cpp
>  --- internal/libraw_x3f.cpp.orig
>  +++ internal/libraw_x3f.cpp
> -@@ -1401,7 +1401,9 @@ static void huffman_decode_row(x3f_info_t *I,
> +@@ -1389,7 +1389,9 @@ static void huffman_decode_row(x3f_info_t *I,
> x3f_image_data_t *ID = >data_subsection.image_data;
> x3f_huffman_t *HUF = ID->huffman;
>   
>

UPDATE: graphics/libraw

2018-05-09 Thread Rafael Sadowski 
Simple update to the latest stable version including:

CVE-2018-10529 fixed: out of bounds read in X3F parser
CVE-2018-10528 fixed: possible stack overrun in X3F parser


Upstream removed own License:
https://www.libraw.org/news/libraw-0-18-released

A bulk would be really nice, anyone?

Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile5 Mar 2018 14:53:40 -   1.35
+++ Makefile9 May 2018 15:23:21 -
@@ -2,18 +2,18 @@
 
 COMMENT =  library for reading RAW files
 
-DISTNAME = LibRaw-0.18.8
+DISTNAME = LibRaw-0.18.10
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   graphics
 
-SHARED_LIBS +=  raw  3.0  # 15.0
-SHARED_LIBS +=  raw_r3.0  # 15.0
+SHARED_LIBS +=  raw  4.0  # 15.0
+SHARED_LIBS +=  raw_r4.0  # 15.0
 
 HOMEPAGE = https://www.libraw.org/
 
 MAINTAINER =   Rafael Sadowski 
 
-# LGPL v2.1 OR CDDL v1.0 OR their own
+# LGPL v2.1 OR CDDL v1.0
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += c jasper jpeg lcms2 m pthread ${COMPILER_LIBCXX}
Index: distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo5 Mar 2018 14:53:40 -   1.11
+++ distinfo9 May 2018 15:23:21 -
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.18.8.tar.gz) = Vqyk/ZcDiSPVfS0X2QqhHYJ/Hz0/HZfp9aDVL/h0IOI=
-SIZE (LibRaw-0.18.8.tar.gz) = 1281773
+SHA256 (LibRaw-0.18.10.tar.gz) = CMm78rtfiuzng9BeC1Joqq5VYqNNlA4X7noiy8L7mU4=
+SIZE (LibRaw-0.18.10.tar.gz) = 1282206
Index: patches/patch-internal_libraw_x3f_cpp
===
RCS file: /cvs/ports/graphics/libraw/patches/patch-internal_libraw_x3f_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-internal_libraw_x3f_cpp
--- patches/patch-internal_libraw_x3f_cpp   7 Apr 2018 11:05:22 -   
1.4
+++ patches/patch-internal_libraw_x3f_cpp   9 May 2018 15:23:21 -
@@ -5,7 +5,7 @@ fix non-constant-expression cannot be na
 Index: internal/libraw_x3f.cpp
 --- internal/libraw_x3f.cpp.orig
 +++ internal/libraw_x3f.cpp
-@@ -1401,7 +1401,9 @@ static void huffman_decode_row(x3f_info_t *I,
+@@ -1389,7 +1389,9 @@ static void huffman_decode_row(x3f_info_t *I,
x3f_image_data_t *ID = >data_subsection.image_data;
x3f_huffman_t *HUF = ID->huffman;

UPDATE: graphics/libraw

2018-03-05 Thread Rafael Sadowski 
Simple update diff to the latest stable version.

All consumers build and package fine on amd64.

graphics/ImageMagick/
graphics/gegl03/
graphics/gthumb/
graphics/inkscape/
graphics/krita/
graphics/nomacs/
graphics/openimageio/
graphics/shotwell/
multimedia/synfig/
multimedia/synfigstudio/
x11/kde4/libkdcraw/

Ok?


Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile26 Jan 2018 16:02:18 -  1.34
+++ Makefile5 Mar 2018 12:16:42 -
@@ -2,12 +2,12 @@
 
 COMMENT =  library for reading RAW files
 
-DISTNAME = LibRaw-0.18.7
+DISTNAME = LibRaw-0.18.8
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   graphics
 
-SHARED_LIBS +=  raw  2.0  # 15.0
-SHARED_LIBS +=  raw_r2.0  # 15.0
+SHARED_LIBS +=  raw  3.0  # 15.0
+SHARED_LIBS +=  raw_r3.0  # 15.0
 
 HOMEPAGE = https://www.libraw.org/
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo26 Jan 2018 16:02:18 -  1.10
+++ distinfo5 Mar 2018 12:16:42 -
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.18.7.tar.gz) = h+NHwmGo6Hk12aI6/XUNJ2drmfVA6FUjFNQNsOoxV3E=
-SIZE (LibRaw-0.18.7.tar.gz) = 1280935
+SHA256 (LibRaw-0.18.8.tar.gz) = Vqyk/ZcDiSPVfS0X2QqhHYJ/Hz0/HZfp9aDVL/h0IOI=
+SIZE (LibRaw-0.18.8.tar.gz) = 1281773

Re: UPDATE: graphics/libraw

2018-01-26 Thread Jeremie Courreges-Anglas 
On Thu, Jan 25 2018, Rafael Sadowski  wrote:
> Simple update to the latest stable version.
>
> Changlog:
>
> https://github.com/LibRaw/LibRaw/compare/0.18.7...master
>
> ok? I don't want to build all consumers. It is worthwhile to push it
> into a bulk?

Not worth it IMO, the tarball diff is trivial.  ok jca@

> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/libraw/Makefile,v
> retrieving revision 1.33
> diff -u -p -u -p -r1.33 Makefile
> --- Makefile  20 Jan 2018 14:03:39 -  1.33
> +++ Makefile  25 Jan 2018 20:18:37 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =library for reading RAW files
>  
> -DISTNAME =   LibRaw-0.18.6
> +DISTNAME =   LibRaw-0.18.7
>  PKGNAME =${DISTNAME:L}
>  CATEGORIES = graphics
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/libraw/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 distinfo
> --- distinfo  21 Dec 2017 07:55:47 -  1.9
> +++ distinfo  25 Jan 2018 20:18:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (LibRaw-0.18.6.tar.gz) = 5bisylWKpFe8khSAIAQyDFYQ0UNMKtsfPqNn8CavpTs=
> -SIZE (LibRaw-0.18.6.tar.gz) = 1282212
> +SHA256 (LibRaw-0.18.7.tar.gz) = h+NHwmGo6Hk12aI6/XUNJ2drmfVA6FUjFNQNsOoxV3E=
> +SIZE (LibRaw-0.18.7.tar.gz) = 1280935
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

UPDATE: graphics/libraw

2018-01-25 Thread Rafael Sadowski 
Simple update to the latest stable version.

Changlog:

https://github.com/LibRaw/LibRaw/compare/0.18.7...master

ok? I don't want to build all consumers. It is worthwhile to push it
into a bulk?

Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile20 Jan 2018 14:03:39 -  1.33
+++ Makefile25 Jan 2018 20:18:37 -
@@ -2,7 +2,7 @@
 
 COMMENT =  library for reading RAW files
 
-DISTNAME = LibRaw-0.18.6
+DISTNAME = LibRaw-0.18.7
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   graphics
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo21 Dec 2017 07:55:47 -  1.9
+++ distinfo25 Jan 2018 20:18:37 -
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.18.6.tar.gz) = 5bisylWKpFe8khSAIAQyDFYQ0UNMKtsfPqNn8CavpTs=
-SIZE (LibRaw-0.18.6.tar.gz) = 1282212
+SHA256 (LibRaw-0.18.7.tar.gz) = h+NHwmGo6Hk12aI6/XUNJ2drmfVA6FUjFNQNsOoxV3E=
+SIZE (LibRaw-0.18.7.tar.gz) = 1280935

UPDATE: graphics/libraw

2017-12-15 Thread Rafael Sadowski 
Simple update to the latest stable version. No symbol changes detected
by nm(1).

Ok?

Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile8 Dec 2017 18:57:20 -   1.31
+++ Makefile15 Dec 2017 19:44:35 -
@@ -2,7 +2,7 @@
 
 COMMENT =  library for reading RAW files
 
-DISTNAME = LibRaw-0.18.5
+DISTNAME = LibRaw-0.18.6
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   graphics
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo4 Oct 2017 20:47:23 -   1.8
+++ distinfo15 Dec 2017 19:44:35 -
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.18.5.tar.gz) = +ip9FNnfr2s2j5WKdteSZrP1jCvDZ766tW4RuqlNoXg=
-SIZE (LibRaw-0.18.5.tar.gz) = 1280046
+SHA256 (LibRaw-0.18.6.tar.gz) = 5bisylWKpFe8khSAIAQyDFYQ0UNMKtsfPqNn8CavpTs=
+SIZE (LibRaw-0.18.6.tar.gz) = 1282212

Re: UPDATE: graphics/libraw

2017-07-02 Thread Jeremie Courreges-Anglas 
Rafael Sadowski  writes:

> On Sat Jul 01, 2017 at 07:26:39PM +0200, Jeremie Courreges-Anglas wrote:
>> Rafael Sadowski  writes:
>> 
>> > Update libraw 0.17.2 -> 0.18.2
>> >
>> > Tested with a few KDE applications,
>> >
>> > OK? Comments?
>> 
>> Looks fine ports-wise (including the major bump).  Did you build all
>> consumers?
>
> Of course! All consumers build fine on amd64.
>
>> 
>> Nits below,
>> 
>
> New diff below.

ok jca@

> Cheers, Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/libraw/Makefile,v
> retrieving revision 1.24
> diff -u -p -u -p -r1.24 Makefile
> --- Makefile  27 Apr 2017 23:15:00 -  1.24
> +++ Makefile  2 Jul 2017 12:39:46 -
> @@ -4,28 +4,25 @@ BROKEN-hppa =   undefined reference to __
>  
>  COMMENT =library for reading RAW files
>  
> -V =  0.17.2
> -DISTNAME =   LibRaw-${V}
> +DISTNAME =   LibRaw-0.18.2
>  PKGNAME =${DISTNAME:L}
> -REVISION =   0
>  CATEGORIES = graphics
>  
> -SHARED_LIBS +=  raw  1.0  # 15.0
> -SHARED_LIBS +=  raw_r1.0  # 15.0
> +SHARED_LIBS +=  raw  2.0  # 15.0
> +SHARED_LIBS +=  raw_r2.0  # 15.0
>  
> -HOMEPAGE =   http://www.libraw.org/
> +HOMEPAGE =   https://www.libraw.org/
>  
>  # LGPL v2.1 OR CDDL v1.0 OR their own
>  PERMIT_PACKAGE_CDROM =   Yes
>  
>  WANTLIB += c jasper jpeg lcms2 m pthread ${LIBCXX}
>  
> -MASTER_SITES =   http://www.libraw.org/data/
> +MASTER_SITES =   https://www.libraw.org/data/
>  
> -MODULES =gcc4
> +COMPILER =   gcc
>  # for atomic builtins (__sync_fetch_and_add_4)
>  MODGCC4_ARCHS =  arm
> -MODGCC4_LANGS =  c++
>  
>  LIB_DEPENDS =graphics/jasper \
>   graphics/lcms2
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/libraw/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo  27 Aug 2016 15:56:27 -  1.6
> +++ distinfo  2 Jul 2017 12:39:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (LibRaw-0.17.2.tar.gz) = krDELHZm7Kkwfl4fl9b+/Bls8LfuCJ4iiAJZp2+v0Vw=
> -SIZE (LibRaw-0.17.2.tar.gz) = 1472714
> +SHA256 (LibRaw-0.18.2.tar.gz) = zjZrs4wRRBMHN+sW6RkDiTe03BqxZReaIl1ehHryq8Y=
> +SIZE (LibRaw-0.18.2.tar.gz) = 1281674
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/libraw/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- pkg/PLIST 22 May 2015 11:31:15 -  1.5
> +++ pkg/PLIST 2 Jul 2017 12:39:46 -
> @@ -30,4 +30,3 @@ share/doc/libraw/COPYRIGHT
>  share/doc/libraw/Changelog.txt
>  share/doc/libraw/LICENSE.CDDL
>  share/doc/libraw/LICENSE.LGPL
> -share/doc/libraw/LICENSE.LibRaw.pdf
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: graphics/libraw

2017-07-02 Thread Rafael Sadowski 
On Sat Jul 01, 2017 at 07:26:39PM +0200, Jeremie Courreges-Anglas wrote:
> Rafael Sadowski  writes:
> 
> > Update libraw 0.17.2 -> 0.18.2
> >
> > Tested with a few KDE applications,
> >
> > OK? Comments?
> 
> Looks fine ports-wise (including the major bump).  Did you build all
> consumers?

Of course! All consumers build fine on amd64.

> 
> Nits below,
> 

New diff below.

Cheers, Rafael

Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile27 Apr 2017 23:15:00 -  1.24
+++ Makefile2 Jul 2017 12:39:46 -
@@ -4,28 +4,25 @@ BROKEN-hppa = undefined reference to __
 
 COMMENT =  library for reading RAW files
 
-V =0.17.2
-DISTNAME = LibRaw-${V}
+DISTNAME = LibRaw-0.18.2
 PKGNAME =  ${DISTNAME:L}
-REVISION = 0
 CATEGORIES =   graphics
 
-SHARED_LIBS +=  raw  1.0  # 15.0
-SHARED_LIBS +=  raw_r1.0  # 15.0
+SHARED_LIBS +=  raw  2.0  # 15.0
+SHARED_LIBS +=  raw_r2.0  # 15.0
 
-HOMEPAGE = http://www.libraw.org/
+HOMEPAGE = https://www.libraw.org/
 
 # LGPL v2.1 OR CDDL v1.0 OR their own
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += c jasper jpeg lcms2 m pthread ${LIBCXX}
 
-MASTER_SITES = http://www.libraw.org/data/
+MASTER_SITES = https://www.libraw.org/data/
 
-MODULES =  gcc4
+COMPILER = gcc
 # for atomic builtins (__sync_fetch_and_add_4)
 MODGCC4_ARCHS =arm
-MODGCC4_LANGS =c++
 
 LIB_DEPENDS =  graphics/jasper \
graphics/lcms2
Index: distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo27 Aug 2016 15:56:27 -  1.6
+++ distinfo2 Jul 2017 12:39:46 -
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.17.2.tar.gz) = krDELHZm7Kkwfl4fl9b+/Bls8LfuCJ4iiAJZp2+v0Vw=
-SIZE (LibRaw-0.17.2.tar.gz) = 1472714
+SHA256 (LibRaw-0.18.2.tar.gz) = zjZrs4wRRBMHN+sW6RkDiTe03BqxZReaIl1ehHryq8Y=
+SIZE (LibRaw-0.18.2.tar.gz) = 1281674
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/libraw/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST   22 May 2015 11:31:15 -  1.5
+++ pkg/PLIST   2 Jul 2017 12:39:46 -
@@ -30,4 +30,3 @@ share/doc/libraw/COPYRIGHT
 share/doc/libraw/Changelog.txt
 share/doc/libraw/LICENSE.CDDL
 share/doc/libraw/LICENSE.LGPL
-share/doc/libraw/LICENSE.LibRaw.pdf

Re: UPDATE: graphics/libraw

2017-07-01 Thread Jeremie Courreges-Anglas 
Rafael Sadowski  writes:

> Update libraw 0.17.2 -> 0.18.2
>
> Tested with a few KDE applications,
>
> OK? Comments?

Looks fine ports-wise (including the major bump).  Did you build all
consumers?

Nits below,

> Best regards,
>
> Rafael Sadowski
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/libraw/Makefile,v
> retrieving revision 1.24
> diff -u -p -u -p -r1.24 Makefile
> --- Makefile  27 Apr 2017 23:15:00 -  1.24
> +++ Makefile  13 Jun 2017 15:46:55 -
> @@ -4,25 +4,23 @@ BROKEN-hppa =   undefined reference to __
>  
>  COMMENT =library for reading RAW files
>  
> -V =  0.17.2
> -DISTNAME =   LibRaw-${V}
> +DISTNAME =   LibRaw-0.18.2
>  PKGNAME =${DISTNAME:L}
> -REVISION =   0
>  CATEGORIES = graphics
>  
> -SHARED_LIBS +=  raw  1.0  # 15.0
> -SHARED_LIBS +=  raw_r1.0  # 15.0
> +SHARED_LIBS +=  raw  2.0  # 15.0
> +SHARED_LIBS +=  raw_r2.0  # 15.0
>  
> -HOMEPAGE =   http://www.libraw.org/
> +HOMEPAGE =   https://www.libraw.org/
>  
>  # LGPL v2.1 OR CDDL v1.0 OR their own
>  PERMIT_PACKAGE_CDROM =   Yes
>  
>  WANTLIB += c jasper jpeg lcms2 m pthread ${LIBCXX}
>  
> -MASTER_SITES =   http://www.libraw.org/data/
> +MASTER_SITES =   ${HOMEPAGE}/data/

Some people prefer having a fully readable url.  Also it introduces an
extra slash.  Maybe just switch to https?

> -MODULES =gcc4
> +COMPILER =   gcc
>  # for atomic builtins (__sync_fetch_and_add_4)
>  MODGCC4_ARCHS =  arm

>  MODGCC4_LANGS =  c++

You could kill this line.

> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/libraw/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- distinfo  27 Aug 2016 15:56:27 -  1.6
> +++ distinfo  13 Jun 2017 15:46:55 -
> @@ -1,2 +1,2 @@
> -SHA256 (LibRaw-0.17.2.tar.gz) = krDELHZm7Kkwfl4fl9b+/Bls8LfuCJ4iiAJZp2+v0Vw=
> -SIZE (LibRaw-0.17.2.tar.gz) = 1472714
> +SHA256 (LibRaw-0.18.2.tar.gz) = zjZrs4wRRBMHN+sW6RkDiTe03BqxZReaIl1ehHryq8Y=
> +SIZE (LibRaw-0.18.2.tar.gz) = 1281674
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure   27 Apr 2017 23:15:00 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-configure,v 1.1 2017/04/27 23:15:00 sthen Exp $
>  configure.orig   Tue Apr 11 11:33:38 2017
> -+++ configureTue Apr 11 11:33:57 2017
> -@@ -16967,7 +16967,7 @@ $as_echo "$as_me: WARNING: Unable to find working 
> LibR
> -   fi
> - fi
> - 
> --LIBS="$LIBS -lm -lstdc++"
> -+LIBS="$LIBS -lm"
> - 
> - LIBRAW_SHLIB_VERSION=15:0:0
> - 
> Index: patches/patch-internal_libraw_x3f_cpp
> ===
> RCS file: patches/patch-internal_libraw_x3f_cpp
> diff -N patches/patch-internal_libraw_x3f_cpp
> --- patches/patch-internal_libraw_x3f_cpp 29 Feb 2016 23:50:13 -  
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-internal_libraw_x3f_cpp,v 1.1 2016/02/29 23:50:13 sthen Exp $
> -
> -remove unicode BOM
> -
>  internal/libraw_x3f.cpp.orig Tue Jan 26 22:00:57 2016
> -+++ internal/libraw_x3f.cpp  Tue Jan 26 22:01:05 2016
> -@@ -1,4 +1,4 @@
> --/* Library for accessing X3F Files 
> -+/*
> - 
> - BSD-style License
> - 
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/libraw/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- pkg/PLIST 22 May 2015 11:31:15 -  1.5
> +++ pkg/PLIST 13 Jun 2017 15:46:55 -
> @@ -30,4 +30,3 @@ share/doc/libraw/COPYRIGHT
>  share/doc/libraw/Changelog.txt
>  share/doc/libraw/LICENSE.CDDL
>  share/doc/libraw/LICENSE.LGPL
> -share/doc/libraw/LICENSE.LibRaw.pdf
>
<#secure method=pgpmime mode=sign>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

UPDATE: graphics/libraw

2017-07-01 Thread Rafael Sadowski 
Update libraw 0.17.2 -> 0.18.2

Tested with a few KDE applications,

OK? Comments?

Best regards,

Rafael Sadowski


Index: Makefile
===
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile27 Apr 2017 23:15:00 -  1.24
+++ Makefile13 Jun 2017 15:46:55 -
@@ -4,25 +4,23 @@ BROKEN-hppa = undefined reference to __
 
 COMMENT =  library for reading RAW files
 
-V =0.17.2
-DISTNAME = LibRaw-${V}
+DISTNAME = LibRaw-0.18.2
 PKGNAME =  ${DISTNAME:L}
-REVISION = 0
 CATEGORIES =   graphics
 
-SHARED_LIBS +=  raw  1.0  # 15.0
-SHARED_LIBS +=  raw_r1.0  # 15.0
+SHARED_LIBS +=  raw  2.0  # 15.0
+SHARED_LIBS +=  raw_r2.0  # 15.0
 
-HOMEPAGE = http://www.libraw.org/
+HOMEPAGE = https://www.libraw.org/
 
 # LGPL v2.1 OR CDDL v1.0 OR their own
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += c jasper jpeg lcms2 m pthread ${LIBCXX}
 
-MASTER_SITES = http://www.libraw.org/data/
+MASTER_SITES = ${HOMEPAGE}/data/
 
-MODULES =  gcc4
+COMPILER = gcc
 # for atomic builtins (__sync_fetch_and_add_4)
 MODGCC4_ARCHS =arm
 MODGCC4_LANGS =c++
Index: distinfo
===
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo27 Aug 2016 15:56:27 -  1.6
+++ distinfo13 Jun 2017 15:46:55 -
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.17.2.tar.gz) = krDELHZm7Kkwfl4fl9b+/Bls8LfuCJ4iiAJZp2+v0Vw=
-SIZE (LibRaw-0.17.2.tar.gz) = 1472714
+SHA256 (LibRaw-0.18.2.tar.gz) = zjZrs4wRRBMHN+sW6RkDiTe03BqxZReaIl1ehHryq8Y=
+SIZE (LibRaw-0.18.2.tar.gz) = 1281674
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 27 Apr 2017 23:15:00 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2017/04/27 23:15:00 sthen Exp $
 configure.orig Tue Apr 11 11:33:38 2017
-+++ configure  Tue Apr 11 11:33:57 2017
-@@ -16967,7 +16967,7 @@ $as_echo "$as_me: WARNING: Unable to find working LibR
-   fi
- fi
- 
--LIBS="$LIBS -lm -lstdc++"
-+LIBS="$LIBS -lm"
- 
- LIBRAW_SHLIB_VERSION=15:0:0
- 
Index: patches/patch-internal_libraw_x3f_cpp
===
RCS file: patches/patch-internal_libraw_x3f_cpp
diff -N patches/patch-internal_libraw_x3f_cpp
--- patches/patch-internal_libraw_x3f_cpp   29 Feb 2016 23:50:13 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-internal_libraw_x3f_cpp,v 1.1 2016/02/29 23:50:13 sthen Exp $
-
-remove unicode BOM
-
 internal/libraw_x3f.cpp.orig   Tue Jan 26 22:00:57 2016
-+++ internal/libraw_x3f.cppTue Jan 26 22:01:05 2016
-@@ -1,4 +1,4 @@
--/* Library for accessing X3F Files 
-+/*
- 
- BSD-style License
- 
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/libraw/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST   22 May 2015 11:31:15 -  1.5
+++ pkg/PLIST   13 Jun 2017 15:46:55 -
@@ -30,4 +30,3 @@ share/doc/libraw/COPYRIGHT
 share/doc/libraw/Changelog.txt
 share/doc/libraw/LICENSE.CDDL
 share/doc/libraw/LICENSE.LGPL
-share/doc/libraw/LICENSE.LibRaw.pdf