[vlc-commits] [Git][videolan/vlc][master] contrib: orc: update to the latest version

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0ca61cd3 by Steve Lhomme at 2024-11-06T07:28:13+00:00
contrib: orc: update to the latest version

Fixes a crash in diracpromo-tr1000.ts

The upstream submission of the meson patch can be found at
https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/70

- - - - -


2 changed files:

- contrib/src/orc/SHA512SUMS
- contrib/src/orc/rules.mak


Changes:

=====================================
contrib/src/orc/SHA512SUMS
=====================================
@@ -1 +1 @@
-75f06d603f71077daa952533b33597fb2bce573647ed75496d55e436485b3c58cd6a43865e931c4def32217b0969bb4c07ef222845c28e9e711bfba80d0d9a21  orc-0.4.18.tar.gz
+ba832f9ded503162931c6934b2c93727d2795f31d7de4871607ce44d70ccb5a5f1452b486fda3d33722b4ca0f137809b3c3a3e561bbaae64f94c9021e52cf2c8  orc-0.4.40.tar.bz2


=====================================
contrib/src/orc/rules.mak
=====================================
@@ -1,31 +1,25 @@
 # orc
 
-ORC_VERSION := 0.4.18
-ORC_URL := $(CONTRIB_VIDEOLAN)/orc/orc-$(ORC_VERSION).tar.gz
+ORC_VERSION := 0.4.40
+ORC_URL := https://gitlab.freedesktop.org/gstreamer/orc/-/archive/$(ORC_VERSION)/orc-$(ORC_VERSION).tar.bz2
 
 ifeq ($(call need_pkg,"orc-0.4"),)
 PKGS_FOUND += orc
 endif
 
-DEPS_orc =
-ifdef HAVE_WINSTORE
-# orc uses VirtualAlloc
-DEPS_orc += alloweduwp $(DEPS_alloweduwp)
-endif
-
-$(TARBALLS)/orc-$(ORC_VERSION).tar.gz:
+$(TARBALLS)/orc-$(ORC_VERSION).tar.bz2:
 	$(call download_pkg,$(ORC_URL),orc)
 
-.sum-orc: orc-$(ORC_VERSION).tar.gz
+.sum-orc: orc-$(ORC_VERSION).tar.bz2
 
-orc: orc-$(ORC_VERSION).tar.gz .sum-orc
+orc: orc-$(ORC_VERSION).tar.bz2 .sum-orc
 	$(UNPACK)
-	$(call update_autoconfig,.)
 	$(MOVE)
 
+ORC_CONF := -Dauto_features=disabled
+
 .orc: orc
-	$(MAKEBUILDDIR)
-	$(MAKECONFIGURE)
-	+$(MAKEBUILD) SUBDIRS=orc
-	+$(MAKEBUILD) SUBDIRS=orc install
+	$(MESONCLEAN)
+	$(MESON) $(ORC_CONF)
+	+$(MESONBUILD)
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0ca61cd3fdebfc06177bb5b7dd03597705cd6c10

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0ca61cd3fdebfc06177bb5b7dd03597705cd6c10
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance