x264-devel: removed; successor multimedia/x264

12 files changed, 1 insertions, 412 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 682bf44bd21..2b6ed81a5df 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.327 2022/10/06 07:44:15 pin Exp $
+# $NetBSD: Makefile,v 1.328 2022/10/21 13:00:09 adam Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -215,7 +215,6 @@ SUBDIR+=	tstools
 SUBDIR+=	vlc
 SUBDIR+=	win32-codecs
 SUBDIR+=	x264
-SUBDIR+=	x264-devel
 SUBDIR+=	x265
 SUBDIR+=	xawtv
 SUBDIR+=	xfce4-mpc-plugin
diff --git a/multimedia/x264-devel/DESCR b/multimedia/x264-devel/DESCR
deleted file mode 100644
index 22a69098f99..00000000000
--- a/multimedia/x264-devel/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Development version of x264, a high quality H.264 codec.
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
deleted file mode 100644
index b5be59c4542..00000000000
--- a/multimedia/x264-devel/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.84 2022/06/28 11:34:57 wiz Exp $
-
-DISTNAME=	x264-snapshot-20191217-2245
-PKGNAME=	${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//}
-PKGREVISION=	3
-CATEGORIES=	multimedia
-MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	joerg@NetBSD.org
-HOMEPAGE=	https://www.videolan.org/developers/x264.html
-COMMENT=	GPL licensed H.264 encoder
-LICENSE=	gnu-gpl-v2
-
-.include "../../mk/bsd.prefs.mk"
-
-# Assembler code still needs to be disabled on at least SunOS.
-# NetBSD/i386 needs ASM disabled to avoid text relocations.
-# NetBSD/mips needs ASM disabled because it uses the MSA extension
-# (requires MIPS64 revision 2) and fails to build.
-.if ${OPSYS} == "SunOS" || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-mips*)
-CONFIGURE_ARGS+=	--disable-asm
-.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
-    (${OPSYS} == "Darwin" && ${MACHINE_ARCH} == "aarch64")
-TOOL_DEPENDS+=		nasm>=2.13.0:../../devel/nasm
-.endif
-
-USE_TOOLS+=		bash gmake
-USE_LIBTOOL=		yes
-HAS_CONFIGURE=		yes
-CONFIG_SHELL=		${BASH}
-CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ARGS+=	--enable-static
-CONFIGURE_ARGS+=	--enable-pic
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-.if ${OPSYS} == "Darwin"
-USE_TOOLS+=		perl
-.else
-CONFIGURE_ARGS+=	--disable-opencl
-.endif
-MAKE_ENV+=		SH=${SH:Q}
-
-# tries to use /usr/ucb/install to create multiple directories
-# PR pkg/56512
-MAKE_FLAGS.SunOS+=	INSTALL=${INSTALL}
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) || !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
-# XXX Consider passing this whether cross-compiling or not.
-CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM}
-.endif
-
-BUILD_TARGET=		default
-INSTALL_TARGET=		install-lib-shared install-lib-static install-cli
-INSTALLATION_DIRS=	bin
-REPLACE_SH=		version.sh
-
-.include "../../mk/dlopen.buildlink3.mk"
-
-CHECK_BUILTIN.pthread:=	yes
-.include "../../mk/pthread.builtin.mk"
-CHECK_BUILTIN.pthread:=	no
-
-.if !empty(USE_BUILTIN.pthread:M[Yy][Ee][Ss])
-X264_BUILD_THREADS_SUPPORT=	yes
-.else
-X264_BUILD_THREADS_SUPPORT=	${DLOPEN_REQUIRE_PTHREADS}
-.endif
-
-.include "options.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/x264-devel/PLIST b/multimedia/x264-devel/PLIST
deleted file mode 100644
index 16003c07127..00000000000
--- a/multimedia/x264-devel/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2018/10/23 16:12:46 adam Exp $
-bin/x264
-include/x264.h
-include/x264_config.h
-lib/libx264.a
-lib/libx264.so
-lib/libx264.so.157
-lib/pkgconfig/x264.pc
diff --git a/multimedia/x264-devel/buildlink3.mk b/multimedia/x264-devel/buildlink3.mk
deleted file mode 100644
index dff3f00413b..00000000000
--- a/multimedia/x264-devel/buildlink3.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.17 2022/06/28 11:34:57 wiz Exp $
-
-BUILDLINK_TREE+=	x264-devel
-
-.if !defined(X264_DEVEL_BUILDLINK3_MK)
-X264_DEVEL_BUILDLINK3_MK:=
-
-###
-### NOTE: When changing BUILDLINK_A[BP]I_DEPENDS.x264-devel, please record
-###	  the value of X264_BUILD in x264.h along with the appropriate
-###	  dependency specification.  Perhaps we should incorporate this
-###	  into the version number and/or pkg-config file?
-###
-###	  Prior specification: x264-devel>=20060127 # X264_BUILD 44
-###	  Prior specification: x264-devel>=20081217 # X264_BUILD 65
-###	  Prior specification: x264-devel>=20110101 # X264_BUILD 112
-###	  Prior specification: x264-devel>=20121107 # X264_BUILD 128
-###	  Prior specification: x264-devel>=20130115 # X264_BUILD 129
-###	  Prior specification: x264-devel>=20130703 # X264_BUILD 133
-###	  Prior specification: x264-devel>=20131015 # X264_BUILD 138
-###	  Prior specification: x264-devel>=20140303 # X264_BUILD 142
-###
-BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20180224 # X264_BUILD 152
-BUILDLINK_ABI_DEPENDS.x264-devel?=	x264-devel>=20191217nb3
-BUILDLINK_PKGSRCDIR.x264-devel?=	../../multimedia/x264-devel
-pkgbase:= x264-devel
-.include "../../mk/pkg-build-options.mk"
-
-.if ${PKG_BUILD_OPTIONS.x264-devel:Mthreads}
-.  include "../../mk/pthread.buildlink3.mk"
-.endif
-.endif # X264_DEVEL_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-x264-devel
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
deleted file mode 100644
index 58bb52bab53..00000000000
--- a/multimedia/x264-devel/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.56 2021/10/26 11:01:19 nia Exp $
-
-BLAKE2s (x264-snapshot-20191217-2245.tar.bz2) = 7b9ecf06499f7e768c8fbf1d8180b09379c03fa02d3112ab3e49f02f2d989ebb
-SHA512 (x264-snapshot-20191217-2245.tar.bz2) = 89061f66fa86dfb868759e5b1dabbb6d1cd9d1240b1bf16afc789f1aa080b3940df5766ddb25e0f0faf0bc8b2603bc35b932848426eeaa4b603199066368f5f0
-Size (x264-snapshot-20191217-2245.tar.bz2) = 774081 bytes
-SHA1 (patch-common_cpu.c) = ef15bae000163e9c10d2e414e841486dd2920b80
-SHA1 (patch-config.guess) = 0ea57f57cdc5c2b98c9fa1a865274b08a8136b07
-SHA1 (patch-config.sub) = bb6303f5200128fb65a7f9ae90653a2dc6876877
-SHA1 (patch-configure) = a55a26beef54352ae8d4b30bddcd9afe664cb8e4
-SHA1 (patch-encoder_analyse.c) = 2057583899e029a4c2173c511293e6a35cf80f78
diff --git a/multimedia/x264-devel/options.mk b/multimedia/x264-devel/options.mk
deleted file mode 100644
index 3550c35f7aa..00000000000
--- a/multimedia/x264-devel/options.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2011/01/17 16:46:42 drochner Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.x264-devel
-PKG_SUPPORTED_OPTIONS=	debug threads
-
-.if !empty(X264_BUILD_THREADS_SUPPORT:M[Yy][Ee][Ss])
-PKG_SUGGESTED_OPTIONS+=	threads
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mthreads)
-.  include "../../mk/pthread.buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-pthread
-.endif
-
-.if !empty(PKG_OPTIONS:Mdebug) || \
-    !empty(INSTALL_UNSTRIPPED:Uno:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-debug
-BUILDLINK_TRANSFORM+=	rm:-fomit-frame-pointer
-.endif
diff --git a/multimedia/x264-devel/patches/patch-common_cpu.c b/multimedia/x264-devel/patches/patch-common_cpu.c
deleted file mode 100644
index 3324d6ccf50..00000000000
--- a/multimedia/x264-devel/patches/patch-common_cpu.c
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-common_cpu.c,v 1.1 2018/02/25 21:57:43 adam Exp $
-
-Add support for NetBSD.
-
---- common/cpu.c.orig	2018-02-07 08:18:42.000000000 +0000
-+++ common/cpu.c
-@@ -37,7 +37,7 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
--#if SYS_OPENBSD
-+#if SYS_OPENBSD || SYS_NETBSD
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <machine/cpu.h>
-@@ -300,20 +300,20 @@ uint32_t x264_cpu_detect( void )
- 
- #elif ARCH_PPC && HAVE_ALTIVEC
- 
--#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
-+#if SYS_MACOSX || SYS_OPENBSD || SYS_NETBSD || SYS_FREEBSD
- #include <sys/sysctl.h>
- uint32_t x264_cpu_detect( void )
- {
-     /* Thank you VLC */
-     uint32_t cpu = 0;
--#if SYS_OPENBSD
-+#if SYS_OPENBSD || SYS_NETBSD
-     int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
- #elif SYS_MACOSX
-     int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
- #endif
-     int      has_altivec = 0;
-     size_t   length = sizeof( has_altivec );
--#if SYS_MACOSX || SYS_OPENBSD
-+#if SYS_MACOSX || SYS_OPENBSD || SYS_NETBSD
-     int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
- #else
-     int      error = sysctlbyname( "hw.altivec", &has_altivec, &length, NULL, 0 );
-@@ -462,10 +462,10 @@ int x264_cpu_num_processors( void )
-     get_system_info( &info );
-     return info.cpu_count;
- 
--#elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD
-+#elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD || SYS_NETBSD
-     int ncpu;
-     size_t length = sizeof( ncpu );
--#if SYS_OPENBSD
-+#if SYS_OPENBSD || SYS_NETBSD
-     int mib[2] = { CTL_HW, HW_NCPU };
-     if( sysctl(mib, 2, &ncpu, &length, NULL, 0) )
- #else
diff --git a/multimedia/x264-devel/patches/patch-config.guess b/multimedia/x264-devel/patches/patch-config.guess
deleted file mode 100644
index 2c3e8c01676..00000000000
--- a/multimedia/x264-devel/patches/patch-config.guess
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-config.guess,v 1.1 2021/07/14 13:19:42 schmonz Exp $
-
-Apply upstream eb95c29 to fix macOS M1 build.
-
---- config.guess.orig	2019-12-17 21:45:04.000000000 +0000
-+++ config.guess
-@@ -1238,6 +1238,9 @@ EOF
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- 	exit ;;
-+    arm64:Darwin:*:*)
-+	echo arm64-apple-darwin${UNAME_RELEASE}
-+	exit ;;
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
diff --git a/multimedia/x264-devel/patches/patch-config.sub b/multimedia/x264-devel/patches/patch-config.sub
deleted file mode 100644
index 6116e14c53c..00000000000
--- a/multimedia/x264-devel/patches/patch-config.sub
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-config.sub,v 1.1 2021/07/14 13:19:42 schmonz Exp $
-
-Apply upstream eb95c29 to fix macOS M1 build.
-
---- config.sub.orig	2019-12-17 21:45:04.000000000 +0000
-+++ config.sub
-@@ -255,7 +255,7 @@ case $basic_machine in
- 	# Some are omitted here because they have special meanings below.
- 	1750a | 580 \
- 	| a29k \
--	| aarch64 | aarch64_be \
-+	| aarch64 | aarch64_be | arm64 \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
-@@ -369,7 +369,7 @@ case $basic_machine in
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
--	| aarch64-* | aarch64_be-* \
-+	| aarch64-* | aarch64_be-* | arm64*-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
diff --git a/multimedia/x264-devel/patches/patch-configure b/multimedia/x264-devel/patches/patch-configure
deleted file mode 100644
index ef2edaca6f2..00000000000
--- a/multimedia/x264-devel/patches/patch-configure
+++ /dev/null
@@ -1,155 +0,0 @@
-$NetBSD: patch-configure,v 1.5 2021/07/14 13:19:42 schmonz Exp $
-
-Add support for DragonFly.
-Use 'amd64' as a synonym for 'x86_64'.
-Avoid endian test failure for -flto.
-Do not force compiler optimisations.
-If we fail an assembly test, continue as if --disable-asm
-was passed.
-Apply upstream eb95c29 to fix macOS M1 build.
-
---- configure.orig	2021-07-14 13:16:59.000000000 +0000
-+++ configure
-@@ -630,6 +630,10 @@ case $host_os in
-         SYS="FREEBSD"
-         libm="-lm"
-         ;;
-+    dragonfly*)
-+        SYS="DRAGONFLY"
-+        LDFLAGS="$LDFLAGS -lm"
-+        ;;
-     kfreebsd*-gnu)
-         SYS="FREEBSD"
-         define HAVE_MALLOC_H
-@@ -730,7 +734,7 @@ case $host_cpu in
-             ASFLAGS="$ASFLAGS -f elf32"
-         fi
-         ;;
--    x86_64)
-+    x86_64|amd64)
-         ARCH="X86_64"
-         AS="${AS-nasm}"
-         AS_EXT=".asm"
-@@ -759,14 +763,15 @@ case $host_cpu in
-         fi
-         ;;
-     powerpc*)
--        ARCH="PPC"
-         if [ $asm = auto ] ; then
-             define HAVE_ALTIVEC
-             AS="${AS-${CC}}"
-             AS_EXT=".c"
-             if [ $SYS = MACOSX ] ; then
-+                ARCH="POWERPC"
-                 CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
-             else
-+                ARCH="PPC"
-                 CFLAGS="$CFLAGS -maltivec -mabi=altivec"
-                 define HAVE_ALTIVEC_H
-             fi
-@@ -788,6 +793,18 @@ case $host_cpu in
-         AS="${AS-${CC}}"
-         AS_EXT=".c"
-         ;;
-+    aarch64|arm64*)
-+        ARCH="AARCH64"
-+        stack_alignment=16
-+        if [ "$SYS" = MACOSX ] ; then
-+            AS="${AS-${CC}}"
-+            ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
-+        elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
-+            AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
-+        else
-+            AS="${AS-${CC}}"
-+        fi
-+        ;;
-     arm*)
-         ARCH="ARM"
-         if [ "$SYS" = MACOSX ] ; then
-@@ -806,18 +823,6 @@ case $host_cpu in
-             AS="${AS-${CC}}"
-         fi
-         ;;
--    aarch64)
--        ARCH="AARCH64"
--        stack_alignment=16
--        if [ "$SYS" = MACOSX ] ; then
--            AS="${AS-${CC}}"
--            ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
--        elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
--            AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
--        else
--            AS="${AS-${CC}}"
--        fi
--        ;;
-     s390|s390x)
-         ARCH="S390"
-         ;;
-@@ -944,8 +949,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
-         ASFLAGS="$ASFLAGS -c"
-     else
-         echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
--        echo "If you really want to run on such a CPU, configure with --disable-asm."
--        exit 1
-+	echo "Disabling asm"
-+	asm="no"
-     fi
- fi
- 
-@@ -957,8 +962,8 @@ if [ $asm = auto -a $ARCH = AARCH64 ] ; 
-         ASFLAGS="$ASFLAGS -c"
-     else
-         echo "no NEON support, try adding -mfpu=neon to CFLAGS"
--        echo "If you really want to run on such a CPU, configure with --disable-asm."
--        exit 1
-+	echo "Disabling asm"
-+	asm="no"
-     fi
- fi
- 
-@@ -976,8 +981,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
-         define HAVE_MSA
-     else
-         echo "You specified a pre-MSA CPU in your CFLAGS."
--        echo "If you really want to run on such a CPU, configure with --disable-asm."
--        exit 1
-+	echo "Disabling asm"
-+	asm="no"
-     fi
- fi
- 
-@@ -994,7 +999,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
- CPU_ENDIAN="little-endian"
- if [ $compiler = GNU ]; then
-     echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
--    $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
-+    $CC $CPPFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
-     if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
-         define WORDS_BIGENDIAN
-         CPU_ENDIAN="big-endian"
-@@ -1016,7 +1021,7 @@ fi
- 
- # autodetect options that weren't forced nor disabled
- 
--libpthread=""
-+libpthread="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
- if [ "$SYS" = "WINDOWS" -a "$thread" = "posix" ] ; then
-     if [ "$gpl" = "no" ] ; then
-         echo "Warning: pthread-win32 is LGPL and is therefore not supported with --disable-gpl"
-@@ -1255,7 +1260,7 @@ if [ "$pic" = "yes" ] ; then
-     [ "$SYS" != WINDOWS -a "$SYS" != CYGWIN ] && CFLAGS="$CFLAGS -fPIC"
-     [[ "$ASFLAGS" != *"-DPIC"* ]] && ASFLAGS="$ASFLAGS -DPIC"
-     # resolve textrels in the x86 asm
--    cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
-+    cc_check stdio.h "-Wl,-Bsymbolic" && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
-     [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
- fi
- 
-@@ -1271,7 +1276,6 @@ if [ "$debug" = "yes" ]; then
-     CFLAGS="-O1 -g $CFLAGS"
-     RCFLAGS="$RCFLAGS -DDEBUG"
- else
--    CFLAGS="-O3 -ffast-math $CFLAGS"
-     if [ "$lto" = "auto" ] && [ $compiler = GNU ] && cc_check "" "-flto" ; then
-         lto="yes"
-         CFLAGS="$CFLAGS -flto"
diff --git a/multimedia/x264-devel/patches/patch-encoder_analyse.c b/multimedia/x264-devel/patches/patch-encoder_analyse.c
deleted file mode 100644
index da1e8d054e2..00000000000
--- a/multimedia/x264-devel/patches/patch-encoder_analyse.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-encoder_analyse.c,v 1.2 2017/07/14 08:12:34 adam Exp $
-
-Use logf() instead of log2f.
-
---- encoder/analyse.c.orig	2017-07-12 20:45:03.000000000 +0000
-+++ encoder/analyse.c
-@@ -309,7 +309,7 @@ int x264_analyse_init_costs( x264_t *h )
- 
-     logs[0] = 0.718f;
-     for( int i = 1; i <= 2*4*mv_range; i++ )
--        logs[i] = log2f( i+1 ) * 2.0f + 1.718f;
-+        logs[i] = logf(i+1)*2.88539f + 1.718f;
- 
-     for( int qp = X264_MIN( h->param.rc.i_qp_min, QP_MAX_SPEC ); qp <= h->param.rc.i_qp_max; qp++ )
-         if( init_costs( h, logs, qp ) )