Skip to content

Commit

Permalink
multimedia/libvpx: update 1.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jbeich committed Jan 20, 2024
1 parent 411de5f commit 589aaae
Show file tree
Hide file tree
Showing 50 changed files with 141 additions and 98 deletions.
1 change: 1 addition & 0 deletions audio/baresip/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
PORTNAME= baresip
DISTVERSIONPREFIX= v
DISTVERSION= 3.6.0
PORTREVISION= 1
CATEGORIES= audio

MAINTAINER= ports@FreeBSD.org
Expand Down
2 changes: 1 addition & 1 deletion cad/opencascade/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= opencascade
DISTVERSION= 7.7.0
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= cad science
MASTER_SITES= LOCAL/thierry

Expand Down
2 changes: 1 addition & 1 deletion devel/godot/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PORTNAME= godot
DISTVERSION= 4.1.2
DISTVERSIONSUFFIX= -stable
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= devel games

MAINTAINER= FreeBSD@Shaneware.biz
Expand Down
2 changes: 1 addition & 1 deletion devel/godot35/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PORTNAME= godot
DISTVERSION= 3.5.3
DISTVERSIONSUFFIX= -stable
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= devel games
PKGNAMESUFFIX?= 35

Expand Down
1 change: 1 addition & 0 deletions devel/py-aiortc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= aiortc
PORTVERSION= 1.6.0
PORTREVISION= 1
CATEGORIES= devel multimedia python www
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Expand Down
2 changes: 1 addition & 1 deletion editors/vscode/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= vscode
DISTVERSION= 1.85.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
DISTFILES= yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
Expand Down
2 changes: 1 addition & 1 deletion emulators/virtualbox-ose-legacy/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= virtualbox-ose
PORTVERSION= 5.2.44
PORTREVISION?= 16
PORTREVISION?= 17
CATEGORIES= emulators
MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?= -legacy
Expand Down
2 changes: 1 addition & 1 deletion emulators/virtualbox-ose/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= virtualbox-ose
PORTVERSION= 6.1.50
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
Expand Down
1 change: 1 addition & 0 deletions games/NBlood/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= NBlood
DISTVERSION= r13934
PORTREVISION= 1
CATEGORIES= games

MAINTAINER= pkubaj@FreeBSD.org
Expand Down
1 change: 1 addition & 0 deletions games/eduke32/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= eduke32
PORTVERSION= 20231007
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://dukeworld.com/eduke32/synthesis/${PORTVERSION}-${GITREVISION}/:eduke32 \
LOCAL/pkubaj/:erp \
Expand Down
2 changes: 1 addition & 1 deletion games/openbor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PORTNAME= openbor
# Hint: svn revision is git rev-list --count ${GH_TAGNAME}
PORTVERSION?= 7534
.ifndef PKGNAMESUFFIX
PORTREVISION= 0
PORTREVISION= 1
.endif
CATEGORIES= games

Expand Down
2 changes: 1 addition & 1 deletion games/openbor4432/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PORTVERSION= 4432
PORTREVISION= 5
PORTREVISION= 6
PKGNAMESUFFIX= ${PORTVERSION}

MASTERDIR= ${.CURDIR}/../openbor
Expand Down
2 changes: 1 addition & 1 deletion games/openbor7144/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PORTVERSION= 7144
PORTREVISION= 0
PORTREVISION= 1
PKGNAMESUFFIX= ${PORTVERSION}

MASTERDIR= ${.CURDIR}/../openbor
Expand Down
1 change: 1 addition & 0 deletions games/scummvm/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= scummvm
PORTVERSION= 2.8.0
PORTREVISION= 1
CATEGORIES= games emulators
MASTER_SITES= https://downloads.scummvm.org/frs/${PORTNAME}/${PORTVERSION}/

Expand Down
1 change: 1 addition & 0 deletions mail/thunderbird/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= thunderbird
DISTVERSION= 115.7.0
PORTREVISION= 1
CATEGORIES= mail news net-im wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
Expand Down
2 changes: 1 addition & 1 deletion multimedia/avidemux-plugins/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= avidemux
PORTVERSION= ${AVIDEMUX_VERSION}
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= multimedia
PKGNAMESUFFIX= -plugins

Expand Down
2 changes: 1 addition & 1 deletion multimedia/emby-server-devel/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DISTVERSION= 4.8.0.72
PORTREVISION= 0
PORTREVISION= 1
PKGNAMESUFFIX= -devel

DIST_SUBDIR= ${PORTNAME}${PKGNAMESUFFIX}
Expand Down
2 changes: 1 addition & 1 deletion multimedia/emby-server/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= emby-server
DISTVERSION?= 4.7.14.0
PORTREVISION?= 8
PORTREVISION?= 9
CATEGORIES= multimedia
MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \
https://mediabrowser.github.io/embytools/
Expand Down
1 change: 1 addition & 0 deletions multimedia/ffmpeg/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= ffmpeg
PORTVERSION= 6.1.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/
Expand Down
2 changes: 1 addition & 1 deletion multimedia/ffmpeg4/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= ffmpeg
PORTVERSION= 4.4.4
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/
PKGNAMESUFFIX= 4
Expand Down
2 changes: 1 addition & 1 deletion multimedia/gstreamer1-plugins-vpx/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= multimedia

COMMENT= GStreamer vp8 codec plugin
Expand Down
1 change: 1 addition & 0 deletions multimedia/handbrake/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= handbrake
DISTVERSION= 1.7.2
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= https://github.com/HandBrake/HandBrake/releases/download/${DISTVERSION}/
MASTER_SITES+= https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/:contrib
Expand Down
2 changes: 1 addition & 1 deletion multimedia/libvpx/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PORTNAME= libvpx
DISTVERSIONPREFIX= v
DISTVERSION= 1.13.1
DISTVERSION= 1.14.0
CATEGORIES= multimedia

MAINTAINER= jbeich@FreeBSD.org
Expand Down
6 changes: 3 additions & 3 deletions multimedia/libvpx/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1696025174
SHA256 (webmproject-libvpx-v1.13.1_GH0.tar.gz) = 00dae80465567272abd077f59355f95ac91d7809a2d3006f9ace2637dd429d14
SIZE (webmproject-libvpx-v1.13.1_GH0.tar.gz) = 5515662
TIMESTAMP = 1704834742
SHA256 (webmproject-libvpx-v1.14.0_GH0.tar.gz) = 5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa
SIZE (webmproject-libvpx-v1.14.0_GH0.tar.gz) = 5606471
10 changes: 5 additions & 5 deletions multimedia/libvpx/files/patch-build_make_Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
- Make sure NEON is available when building with intrinsics

--- build/make/Makefile.orig
--- build/make/Makefile.orig 2024-01-09 21:12:22 UTC
+++ build/make/Makefile
@@ -142,6 +142,28 @@ $(BUILD_PFX)%_avx2.c.o: CFLAGS += -mavx2
$(BUILD_PFX)%_avx512.c.d: CFLAGS += -mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl
$(BUILD_PFX)%_avx512.c.o: CFLAGS += -mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl
@@ -151,6 +151,28 @@ $(BUILD_PFX)%_sve.c.o: CFLAGS += -march=armv8.2-a+dotp
$(BUILD_PFX)%_sve.c.d: CFLAGS += -march=armv8.2-a+dotprod+i8mm+sve
$(BUILD_PFX)%_sve.c.o: CFLAGS += -march=armv8.2-a+dotprod+i8mm+sve

+# ARM
+ifeq ($(TGT_ISA),armv6)
Expand All @@ -31,7 +31,7 @@
# POWER
$(BUILD_PFX)%_vsx.c.d: CFLAGS += -maltivec -mvsx
$(BUILD_PFX)%_vsx.c.o: CFLAGS += -maltivec -mvsx
@@ -230,8 +230,8 @@
@@ -299,8 +321,8 @@ $(DIST_DIR)/$(1): $(2)
define install_map_template
$(DIST_DIR)/$(1): $(2)
$(if $(quiet),@echo " [INSTALL] $$@")
Expand Down
20 changes: 10 additions & 10 deletions multimedia/libvpx/files/patch-build_make_configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
- Recognize DragonFly as x86_64-linux-gcc target by default
- Don't override -march= on armv6, armv7 and aarch64
--- build/make/configure.sh.orig 2018-01-24 22:25:44 UTC
--- build/make/configure.sh.orig 2024-01-09 21:12:22 UTC
+++ build/make/configure.sh
@@ -696,6 +696,14 @@ process_common_toolchain() {
@@ -752,6 +752,14 @@ process_common_toolchain() {
aarch64*)
tgt_isa=arm64
;;
Expand All @@ -19,7 +19,7 @@
armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
tgt_isa=armv7
float_abi=hard
@@ -767,7 +767,7 @@ process_common_toolchain() {
@@ -806,7 +814,7 @@ process_common_toolchain() {
[ -z "$tgt_isa" ] && tgt_isa=x86
tgt_os=win32
;;
Expand All @@ -28,18 +28,18 @@
tgt_os=linux
;;
*solaris2.10)
@@ -914,7 +922,7 @@ process_common_toolchain() {
arm64|armv8)
soft_enable neon
@@ -997,7 +1005,7 @@ EOF
fi
done
;;
- armv7|armv7s)
+ armv6|armv7|armv7s)
soft_enable neon
# Only enable neon_asm when neon is also enabled.
enabled neon && soft_enable neon_asm
@@ -935,29 +943,6 @@
@@ -1017,29 +1025,6 @@ EOF
arch_int=${tgt_isa##armv}
arch_int=${arch_int%%te}
check_add_asflags --defsym ARCHITECTURE=${arch_int}
tune_cflags="-mtune="
- if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
- if [ -z "${float_abi}" ]; then
Expand All @@ -65,5 +65,5 @@
- fi
-
enabled debug && add_asflags -g
asm_conversion_cmd="${source_path}/build/make/ads2gas.pl"
if enabled thumb; then
asm_conversion_cmd="${source_path_mk}/build/make/ads2gas.pl"
14 changes: 7 additions & 7 deletions multimedia/libvpx/files/patch-configure
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
- --version is a GNUism which BSD diff doesn't support
- Skip bogus NEON check when soft-enabled on armv6

--- configure.orig 2023-02-08 01:33:51 UTC
--- configure.orig 2024-01-09 21:12:22 UTC
+++ configure
@@ -107,6 +107,7 @@ all_platforms="${all_platforms} arm64-win64-vs17"
all_platforms="${all_platforms} arm64-win64-vs15"
all_platforms="${all_platforms} arm64-win64-vs16"
@@ -110,6 +110,7 @@ all_platforms="${all_platforms} arm64-win64-vs17-clang
all_platforms="${all_platforms} arm64-win64-vs16-clangcl"
all_platforms="${all_platforms} arm64-win64-vs17"
all_platforms="${all_platforms} arm64-win64-vs17-clangcl"
+all_platforms="${all_platforms} armv6-linux-gcc"
all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8
@@ -124,6 +125,7 @@ all_platforms="${all_platforms} ppc64le-linux-gcc"
@@ -127,6 +128,7 @@ all_platforms="${all_platforms} ppc64le-linux-gcc"
all_platforms="${all_platforms} mips32-linux-gcc"
all_platforms="${all_platforms} mips64-linux-gcc"
all_platforms="${all_platforms} ppc64le-linux-gcc"
+all_platforms="${all_platforms} sparc-linux-gcc"
all_platforms="${all_platforms} sparc-solaris-gcc"
all_platforms="${all_platforms} x86-android-gcc"
all_platforms="${all_platforms} x86-darwin8-gcc"
@@ -183,7 +185,7 @@ done
@@ -187,7 +189,7 @@ done
[ -f "${source_path}/${t}.mk" ] && enable_feature ${t}
done

Expand All @@ -29,7 +29,7 @@
die "diff missing: Try installing diffutils via your package manager."
fi

@@ -621,9 +623,6 @@ EOF
@@ -633,9 +635,6 @@ EOF

check_header vpx/vpx_integer.h -I${source_path} && enable_feature vpx_ports

Expand Down
6 changes: 3 additions & 3 deletions multimedia/libvpx/files/patch-libs.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- libs.mk.orig 2017-01-12 20:27:27 UTC
--- libs.mk.orig 2024-01-09 21:12:22 UTC
+++ libs.mk
@@ -339,8 +339,8 @@ else
@@ -408,8 +408,8 @@ endif
$(qexec)echo 'Libs.private: -lm' >> $@
endif
$(qexec)echo 'Cflags: -I$${includedir}' >> $@
Expand All @@ -9,5 +9,5 @@
+INSTALL-LIBS-yes += libdata/pkgconfig/vpx.pc
+INSTALL_MAPS += libdata/pkgconfig/%.pc %.pc
CLEAN-OBJS += vpx.pc
endif

ifeq ($(CONFIG_ENCODERS),yes)
39 changes: 39 additions & 0 deletions multimedia/libvpx/files/patch-vpx__ports_aarch32__cpudetect.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
- Assume NEON is enabled on armv7
- Implement runtime detection on FreeBSD

--- vpx_ports/aarch32_cpudetect.c.orig 2024-01-09 21:12:22 UTC
+++ vpx_ports/aarch32_cpudetect.c
@@ -12,7 +12,7 @@
#include "./vpx_config.h"
#include "arm_cpudetect.h"

-#if !CONFIG_RUNTIME_CPU_DETECT
+#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON)

static int arm_get_cpu_caps(void) {
// This function should actually be a no-op. There is no way to adjust any of
@@ -57,9 +57,23 @@ static int arm_get_cpu_caps(void) {
return flags;
}

-#elif defined(__linux__) // end defined(AOM_USE_ANDROID_CPU_FEATURES)
+#elif defined(__linux__) || defined(__FreeBSD__) // end defined(AOM_USE_ANDROID_CPU_FEATURES)

#include <sys/auxv.h>
+
+#if defined(__FreeBSD__)
+static unsigned long getauxval(unsigned long type)
+{
+ /* Only AT_HWCAP* return unsigned long */
+ if (type != AT_HWCAP && type != AT_HWCAP2) {
+ return 0;
+ }
+
+ unsigned long ret = 0;
+ elf_aux_info(type, &ret, sizeof(ret));
+ return ret;
+}
+#endif

// Define hwcap values ourselves: building with an old auxv header where these
// hwcap values are not defined should not prevent features from being enabled.
29 changes: 29 additions & 0 deletions multimedia/libvpx/files/patch-vpx__ports_aarch64__cpudetect.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- Implement runtime detection on FreeBSD

--- vpx_ports/aarch64_cpudetect.c.orig 2024-01-09 21:12:22 UTC
+++ vpx_ports/aarch64_cpudetect.c
@@ -91,9 +91,23 @@ static int arm_get_cpu_caps(void) {
return flags;
}

-#elif defined(__linux__) // end defined(VPX_USE_ANDROID_CPU_FEATURES)
+#elif defined(__linux__) || defined(__FreeBSD__) // end defined(VPX_USE_ANDROID_CPU_FEATURES)

#include <sys/auxv.h>
+
+#if defined(__FreeBSD__)
+static unsigned long getauxval(unsigned long type)
+{
+ /* Only AT_HWCAP* return unsigned long */
+ if (type != AT_HWCAP && type != AT_HWCAP2) {
+ return 0;
+ }
+
+ unsigned long ret = 0;
+ elf_aux_info(type, &ret, sizeof(ret));
+ return ret;
+}
+#endif

// Define hwcap values ourselves: building with an old auxv header where these
// hwcap values are not defined should not prevent features from being enabled.
Loading

0 comments on commit 589aaae

Please sign in to comment.