CVS commit: pkgsrc/multimedia/libde265

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jan 31 01:37:11 UTC 2023

Modified Files:
        pkgsrc/multimedia/libde265: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libde265/patches: patch-configure.ac

Log Message:
libde265: Fix string substitution in libde265.pc

* Fix consumer's builds. In autotools case, replace CMAKE_* too.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/libde265/Makefile \
    pkgsrc/multimedia/libde265/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/libde265/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/multimedia/libde265/Makefile
diff -u pkgsrc/multimedia/libde265/Makefile:1.7 pkgsrc/multimedia/libde265/Makefile:1.8
--- pkgsrc/multimedia/libde265/Makefile:1.7     Mon Jan 30 18:00:16 2023
+++ pkgsrc/multimedia/libde265/Makefile Tue Jan 31 01:37:11 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2023/01/30 18:00:16 adam Exp $
+# $NetBSD: Makefile,v 1.8 2023/01/31 01:37:11 ryoon Exp $
 
 DISTNAME=      libde265-1.0.10
+PKGREVISION=   1
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=strukturag/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -11,10 +12,14 @@ COMMENT=    Open h.265 video codec implemen
 LICENSE=       gnu-lgpl-v3
 
 USE_LANGUAGES=         c c++
+USE_TOOLS+=            autoconf automake autoreconf
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-sherlock265
 CONFIGURE_ARGS+=       --enable-encoder
 PKGCONFIG_OVERRIDE+=   libde265.pc.in
 
+pre-configure:
+       set -e; cd ${WRKSRC} && autoreconf -fi
+
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/libde265/distinfo
diff -u pkgsrc/multimedia/libde265/distinfo:1.7 pkgsrc/multimedia/libde265/distinfo:1.8
--- pkgsrc/multimedia/libde265/distinfo:1.7     Mon Jan 30 18:00:16 2023
+++ pkgsrc/multimedia/libde265/distinfo Tue Jan 31 01:37:11 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2023/01/30 18:00:16 adam Exp $
+$NetBSD: distinfo,v 1.8 2023/01/31 01:37:11 ryoon Exp $
 
 BLAKE2s (libde265-1.0.10.tar.gz) = 8cd81f2c1ddc2ac4c298c6c91ce650c981cee4e8886320abb19c4ec5a2bdfc45
 SHA512 (libde265-1.0.10.tar.gz) = f10def071ec6398ab0a7647b3f6e42a10ce559ea74acba4044ee2902da93bb5f15cba301b72fc48a2ee15b7e031d5ec8c78aa3d1e9eb304a7e5f33a419a5713a
 Size (libde265-1.0.10.tar.gz) = 845556 bytes
+SHA1 (patch-configure.ac) = b8b8736a988390a0bc726db17afc21243b1c1443

Added files:

Index: pkgsrc/multimedia/libde265/patches/patch-configure.ac
diff -u /dev/null pkgsrc/multimedia/libde265/patches/patch-configure.ac:1.1
--- /dev/null   Tue Jan 31 01:37:11 2023
+++ pkgsrc/multimedia/libde265/patches/patch-configure.ac       Tue Jan 31 01:37:11 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-configure.ac,v 1.1 2023/01/31 01:37:11 ryoon Exp $
+
+* Fix libde265.pc.
+
+--- configure.ac.orig  2023-01-27 14:31:04.000000000 +0000
++++ configure.ac
+@@ -18,6 +18,9 @@ AC_SUBST(NUMERIC_VERSION)
+ LIBDE265_CURRENT=1
+ LIBDE265_REVISION=3
+ LIBDE265_AGE=1
++CMAKE_INSTALL_PREFIX=${prefix}
++CMAKE_INSTALL_LIBDIR=lib
++CMAKE_INSTALL_INCLUDEDIR=include
+ 
+ # ---------------------------------------------------------------------------
+ 
+@@ -26,6 +29,9 @@ AC_CANONICAL_SYSTEM
+ AC_SUBST(LIBDE265_CURRENT)
+ AC_SUBST(LIBDE265_REVISION)
+ AC_SUBST(LIBDE265_AGE)
++AC_SUBST(CMAKE_INSTALL_PREFIX)
++AC_SUBST(CMAKE_INSTALL_LIBDIR)
++AC_SUBST(CMAKE_INSTALL_INCLUDEDIR)
+ 
+ dnl Initialize libtool
+ LT_INIT