From 4633b9a2ba71ad0aa5e82de9a49c6709c16146b7 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 13 Mar 2022 13:54:05 +0000
Subject: [PATCH] update to orc-0.4.32, from Brad (maintainer)

---
 devel/orc/Makefile                            | 16 +++++++++-------
 devel/orc/distinfo                            |  4 ++--
 devel/orc/patches/patch-configure_ac          | 12 ------------
 devel/orc/patches/patch-orc-uninstalled_pc_in | 12 ------------
 devel/orc/pkg/PLIST                           |  6 ++----
 5 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 devel/orc/patches/patch-configure_ac
 delete mode 100644 devel/orc/patches/patch-orc-uninstalled_pc_in

diff --git a/devel/orc/Makefile b/devel/orc/Makefile
index c4b86824593..3b55ba4fabf 100644
--- a/devel/orc/Makefile
+++ b/devel/orc/Makefile
@@ -1,14 +1,14 @@
 COMMENT=	library and toolset to operate arrays of data
 
-DISTNAME=	orc-0.4.29
+DISTNAME=	orc-0.4.32
 CATEGORIES=	devel
 MASTER_SITES=	https://gstreamer.freedesktop.org/src/orc/
 EXTRACT_SUFX=	.tar.xz
 
-SHARED_LIBS=	orc-0.4		7.0 \
-		orc-test-0.4	6.0
+SHARED_LIBS=	orc-0.4		7.1 \
+		orc-test-0.4	6.1
 
-HOMEPAGE=	http://code.entropywave.com/projects/orc/
+HOMEPAGE=	https://gstreamer.freedesktop.org/modules/orc.html
 
 MAINTAINER=	Brad Smith <brad@comstyle.com>
 
@@ -17,8 +17,10 @@ PERMIT_PACKAGE=	Yes
 
 WANTLIB=	c m pthread
 
-USE_GMAKE=	Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
+BUILD_DEPENDS+=	textproc/gtk-doc
+
+MODULES=	devel/meson
+
+CONFIGURE_ARGS+=-Ddefault_library=both
 
 .include <bsd.port.mk>
diff --git a/devel/orc/distinfo b/devel/orc/distinfo
index 9ab5ce01246..086de6a971b 100644
--- a/devel/orc/distinfo
+++ b/devel/orc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (orc-0.4.29.tar.xz) = T4kB+RRLXsF9/9szVItfTH+ASbDRAjvjRizdZOxaOrI=
-SIZE (orc-0.4.29.tar.xz) = 465076
+SHA256 (orc-0.4.32.tar.xz) = pm49jyt+ZReNeGoB72HyoKC00Lg3DefOE0unPaSvGPA=
+SIZE (orc-0.4.32.tar.xz) = 180340
diff --git a/devel/orc/patches/patch-configure_ac b/devel/orc/patches/patch-configure_ac
deleted file mode 100644
index cc2d0c8aaac..00000000000
--- a/devel/orc/patches/patch-configure_ac
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -244,7 +244,7 @@ ORC_CFLAGS="$ORC_CFLAGS \$(VISIBILITY_CFLAGS) \$(ERROR
- AC_SUBST(ERROR_CFLAGS)
- AC_SUBST(ORC_CFLAGS)
- 
--ORC_LIBS="\$(top_builddir)/orc/liborc-$ORC_MAJORMINOR.la $LIBM $LIBRT"
-+ORC_LIBS="\$(top_builddir)/orc/liborc-$ORC_MAJORMINOR.la $LIBM $LIBRT $PTHREAD_LIBS"
- AC_SUBST(ORC_LIBS)
- 
- #CFLAGS=`echo $CFLAGS | sed s/O2/O0/`
diff --git a/devel/orc/patches/patch-orc-uninstalled_pc_in b/devel/orc/patches/patch-orc-uninstalled_pc_in
deleted file mode 100644
index b20f4abf8b9..00000000000
--- a/devel/orc/patches/patch-orc-uninstalled_pc_in
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: orc-uninstalled.pc.in
---- orc-uninstalled.pc.in.orig
-+++ orc-uninstalled.pc.in
-@@ -7,7 +7,7 @@ includedir=${pcfiledir}/
- Name: orc-@ORC_MAJORMINOR@ uninstalled
- Description: Library of Optimized Inner Loops Runtime Compiler
- Version: @VERSION@
--Libs: -L${libdir} -L${libtestdir} -lorc-@ORC_MAJORMINOR@ @LIBM@ @LIBRT@
-+Libs: -L${libdir} -L${libtestdir} -lorc-@ORC_MAJORMINOR@ @LIBM@ @LIBRT@ @PTHREAD_LIBS@
- Cflags: -I${includedir}
- 
- orcc=${pcfiledir}/tools/orcc@EXEEXT@
diff --git a/devel/orc/pkg/PLIST b/devel/orc/pkg/PLIST
index 732a10abdac..570969b58c0 100644
--- a/devel/orc/pkg/PLIST
+++ b/devel/orc/pkg/PLIST
@@ -39,11 +39,9 @@ include/orc-0.4/orc/orcutils.h
 include/orc-0.4/orc/orcvariable.h
 include/orc-0.4/orc/orcx86.h
 include/orc-0.4/orc/orcx86insn.h
-lib/liborc-0.4.a
-lib/liborc-0.4.la
+@static-lib lib/liborc-0.4.a
 @lib lib/liborc-0.4.so.${LIBorc-0.4_VERSION}
-lib/liborc-test-0.4.a
-lib/liborc-test-0.4.la
+@static-lib lib/liborc-test-0.4.a
 @lib lib/liborc-test-0.4.so.${LIBorc-test-0.4_VERSION}
 lib/pkgconfig/orc-0.4.pc
 lib/pkgconfig/orc-test-0.4.pc