pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia x264-devel: removed; successor multimedia/x264
details: https://anonhg.NetBSD.org/pkgsrc/rev/f7a7839bf981
branches: trunk
changeset: 387080:f7a7839bf981
user: adam <adam%pkgsrc.org@localhost>
date: Fri Oct 21 13:00:09 2022 +0000
description:
x264-devel: removed; successor multimedia/x264
diffstat:
multimedia/Makefile | 3 +-
multimedia/x264-devel/DESCR | 1 -
multimedia/x264-devel/Makefile | 73 --------
multimedia/x264-devel/PLIST | 8 -
multimedia/x264-devel/buildlink3.mk | 34 ---
multimedia/x264-devel/distinfo | 10 -
multimedia/x264-devel/options.mk | 22 --
multimedia/x264-devel/patches/patch-common_cpu.c | 52 ------
multimedia/x264-devel/patches/patch-config.guess | 16 -
multimedia/x264-devel/patches/patch-config.sub | 24 --
multimedia/x264-devel/patches/patch-configure | 155 ------------------
multimedia/x264-devel/patches/patch-encoder_analyse.c | 15 -
12 files changed, 1 insertions(+), 412 deletions(-)
diffs (truncated from 471 to 300 lines):
diff -r b143cf8056b9 -r f7a7839bf981 multimedia/Makefile
--- a/multimedia/Makefile Fri Oct 21 12:55:31 2022 +0000
+++ b/multimedia/Makefile Fri Oct 21 13:00:09 2022 +0000
@@ -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+= vlc
SUBDIR+= win32-codecs
SUBDIR+= x264
-SUBDIR+= x264-devel
SUBDIR+= x265
SUBDIR+= xawtv
SUBDIR+= xfce4-mpc-plugin
diff -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/DESCR
--- a/multimedia/x264-devel/DESCR Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Development version of x264, a high quality H.264 codec.
diff -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/Makefile
--- a/multimedia/x264-devel/Makefile Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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 -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/PLIST
--- a/multimedia/x264-devel/PLIST Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/buildlink3.mk
--- a/multimedia/x264-devel/buildlink3.mk Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/distinfo
--- a/multimedia/x264-devel/distinfo Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/options.mk
--- a/multimedia/x264-devel/options.mk Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/patches/patch-common_cpu.c
--- a/multimedia/x264-devel/patches/patch-common_cpu.c Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/patches/patch-config.guess
--- a/multimedia/x264-devel/patches/patch-config.guess Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/patches/patch-config.sub
--- a/multimedia/x264-devel/patches/patch-config.sub Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r b143cf8056b9 -r f7a7839bf981 multimedia/x264-devel/patches/patch-configure
--- a/multimedia/x264-devel/patches/patch-configure Fri Oct 21 12:55:31 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-$NetBSD: patch-configure,v 1.5 2021/07/14 13:19:42 schmonz Exp $
-
-Add support for DragonFly.
Home |
Main Index |
Thread Index |
Old Index