CVS commit: pkgsrc/multimedia/transcode

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Thu Nov 16 23:54:31 UTC 2023

Modified Files:
        pkgsrc/multimedia/transcode: distinfo
        pkgsrc/multimedia/transcode/patches: patch-configure

Log Message:
fix build with latest ImageMagic v7.

must pass all the cflags down, not just the -I ones.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/multimedia/transcode/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/transcode/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/transcode/distinfo
diff -u pkgsrc/multimedia/transcode/distinfo:1.29 pkgsrc/multimedia/transcode/distinfo:1.30
--- pkgsrc/multimedia/transcode/distinfo:1.29   Tue Oct 26 11:01:19 2021
+++ pkgsrc/multimedia/transcode/distinfo        Thu Nov 16 23:54:31 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.29 2021/10/26 11:01:19 nia Exp $
+$NetBSD: distinfo,v 1.30 2023/11/16 23:54:31 mrg Exp $
 
 BLAKE2s (transcode-1.1.7.tar.bz2) = 4277b13f37bd4389c768e60a6d359791c53713b72b3a108fc82e4958fdb2c9a3
 SHA512 (transcode-1.1.7.tar.bz2) = d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
 Size (transcode-1.1.7.tar.bz2) = 2183627 bytes
 SHA1 (patch-avilib_avidump.c) = 640aac6fc274a685b1847b48870b37b2c2ab1e88
-SHA1 (patch-configure) = 38418cd91750f55828124b5895d42d3af5c2d56a
+SHA1 (patch-configure) = 62d789f7408b27daa07402934d17303082e78f75
 SHA1 (patch-encode_encode_lavc.c) = 5ce01220933d58ab09a58c37146da290a3d91164
 SHA1 (patch-export_aud__aux.c) = 437ffde84123eccfe496c478a9db0066208fe256
 SHA1 (patch-export_export__im.c) = 3a4f08d548cdebdfa618aeff2df398bd61002120

Index: pkgsrc/multimedia/transcode/patches/patch-configure
diff -u pkgsrc/multimedia/transcode/patches/patch-configure:1.2 pkgsrc/multimedia/transcode/patches/patch-configure:1.3
--- pkgsrc/multimedia/transcode/patches/patch-configure:1.2     Mon May 16 19:41:17 2016
+++ pkgsrc/multimedia/transcode/patches/patch-configure Thu Nov 16 23:54:31 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.2 2016/05/16 19:41:17 adam Exp $
+$NetBSD: patch-configure,v 1.3 2023/11/16 23:54:31 mrg Exp $
 
-Fix for ImageMagic v7.
+Fixes for ImageMagic v7.
 Add DragonFly support.
 Make use of PTHREAD_LDFLAGS.
 Portability fix.
 
---- configure.orig     2011-11-19 16:50:37.000000000 +0000
-+++ configure
-@@ -1868,7 +1868,7 @@ Optional Packages:
+--- configure.orig     2011-11-19 10:50:37.000000000 -0600
++++ configure  2023-11-16 17:52:19.858940713 -0600
+@@ -1868,7 +1868,7 @@
    --with-imagemagick-prefix=PFX
                            prefix where imagemagick is installed (/usr)
    --with-imagemagick-includes=DIR
@@ -16,7 +16,7 @@ Portability fix.
                            are installed (/usr/include)
    --with-imagemagick-libs=DIR
                            directory where imagemagick libraries (libnone.so)
-@@ -5096,7 +5096,7 @@ case "${target_os}" in
+@@ -5096,7 +5096,7 @@
  $as_echo "#define OS_LINUX 1" >>confdefs.h
  
      ;;
@@ -25,7 +25,7 @@ Portability fix.
      is_bsd=yes
  
  $as_echo "#define OS_BSD 1" >>confdefs.h
-@@ -19431,7 +19431,7 @@ case "$host" in
+@@ -19431,7 +19431,7 @@
  esac
  # let user override
  if test -n "$PTHREAD_LIBS" ; then
@@ -34,7 +34,7 @@ Portability fix.
  fi
  if test -n "$PTHREAD_CFLAGS" ; then
    pthread_cflags="$PTHREAD_CFLAGS"
-@@ -27651,7 +27651,7 @@ if test x"$enable_imagemagick" = x"yes" 
+@@ -27651,7 +27651,7 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkgconfig support for imagemagick" >&5
  $as_echo_n "checking for pkgconfig support for imagemagick... " >&6; }
    if test x"$PKG_CONFIG" != x"no" ; then
@@ -43,7 +43,7 @@ Portability fix.
        pkg_config_imagemagick="yes"
      fi
    fi
-@@ -27720,7 +27720,7 @@ $as_echo_n "checking how to determine IM
+@@ -27720,7 +27720,7 @@
  $as_echo "user" >&6; }
    else
      if test x"$pkg_config_imagemagick" != x"no" ; then
@@ -52,20 +52,24 @@ Portability fix.
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: pkg-config" >&5
  $as_echo "pkg-config" >&6; }
      else
-@@ -27753,10 +27753,10 @@ $as_echo "default" >&6; }
+@@ -27753,12 +27753,12 @@
    IMAGEMAGICK_EXTRA_CFLAGS="$IMAGEMAGICK_EXTRA_CFLAGS $xi"
    IMAGEMAGICK_EXTRA_CFLAGS="`echo $IMAGEMAGICK_EXTRA_CFLAGS | sed -e 's/  */ /g'`"
  
 -  if test x"magick/api.h" != x"none" ; then
 +  if test x"MagickCore/MagickCore.h" != x"none" ; then
      save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$CPPFLAGS $imagemagick_ii"
+-    CPPFLAGS="$CPPFLAGS $imagemagick_ii"
 -    ac_fn_c_check_header_mongrel "$LINENO" "magick/api.h" "ac_cv_header_magick_api_h" "$ac_includes_default"
++    CPPFLAGS="$CPPFLAGS $IMAGEMAGICK_EXTRA_CFLAGS"
 +    ac_fn_c_check_header_mongrel "$LINENO" "MagickCore/MagickCore.h" "ac_cv_header_magick_api_h" "$ac_includes_default"
  if test "x$ac_cv_header_magick_api_h" = xyes; then :
-   IMAGEMAGICK_CFLAGS="$imagemagick_ii"
+-  IMAGEMAGICK_CFLAGS="$imagemagick_ii"
++  IMAGEMAGICK_CFLAGS="$IMAGEMAGICK_EXTRA_CFLAGS"
  else
-@@ -27771,8 +27771,8 @@ if test x"no" != x"optional" ; then
+ 
+ this_pkg_err="yes"
+@@ -27771,8 +27771,8 @@
    else
      prob="option '--enable-imagemagick' failed"
    fi
@@ -76,7 +80,7 @@ Portability fix.
    Wand  http://www.imagemagick.org/
  
  "
-@@ -27784,7 +27784,7 @@ fi
+@@ -27784,7 +27784,7 @@
  
      CPPFLAGS="$save_CPPFLAGS"
    elif test x"$pkg_config_imagemagick" != x"no" ; then
@@ -85,7 +89,7 @@ Portability fix.
    fi
  
    # get and test the _LIBS
-@@ -27797,7 +27797,7 @@ $as_echo_n "checking how to determine IM
+@@ -27797,7 +27797,7 @@
  $as_echo "user" >&6; }
    else
      if test x"$pkg_config_imagemagick" != x"no" ; then
@@ -94,7 +98,7 @@ Portability fix.
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: pkg-config" >&5
  $as_echo "pkg-config" >&6; }
      else
-@@ -27900,7 +27900,7 @@ fi
+@@ -27900,7 +27900,7 @@
  
      LDFLAGS="$save_LDFLAGS"
    elif test x"$pkg_config_imagemagick" != x"no" ; then
@@ -103,7 +107,7 @@ Portability fix.
    fi
  
    if test x"$this_pkg_err" = x"no" ; then
-@@ -29507,7 +29507,7 @@ if test "${enable_nuv+set}" = set; then 
+@@ -29507,7 +29507,7 @@
      yes) if test yes != "$have_lzo"; then
             as_fn_error $? "liblzo2 is required for NuppelVideo support, try --enable-lzo" "$LINENO" 5
           fi