Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
afac356c by Steve Lhomme at 2024-05-25T10:49:51+00:00
contrib: jpeg: update to 3.0.3 and don't install executables
They make the prebuilt tarballs bigger and we never use them.
- - - - -
b4450a59 by Steve Lhomme at 2024-05-25T10:49:51+00:00
contrib: live555: rename global SUBDIRS variable
- - - - -
c548ff62 by Steve Lhomme at 2024-05-25T10:49:51+00:00
contrib: gettext: update to 0.22.5
- - - - -
5b154d9b by Steve Lhomme at 2024-05-25T10:49:51+00:00
contrib: gettext: don't build command-line tools when cross-compiling
We may need a separate target for the native tools.
- - - - -
afff6353 by Steve Lhomme at 2024-05-25T10:49:51+00:00
contrib: gcrypt: don't build command-line tools when cross-compiling
It builds faster and makes prebuilt tarballs smaller.
- - - - -
b5cfbf6e by Steve Lhomme at 2024-05-25T10:49:51+00:00
contrib: schroedinger: compile the same core in native and cross-compiled builds
- - - - -
71eed78d by Steve Lhomme at 2024-05-25T10:49:51+00:00
contrib: orc: only build/install the library
- - - - -
1a2dfb8b by Steve Lhomme at 2024-05-25T10:49:51+00:00
contrib: goom: bypass MMX checks and assume it's there
And no other acceleration, which we didn't use anyway.
- - - - -
11 changed files:
- contrib/src/gcrypt/rules.mak
- contrib/src/gettext/SHA512SUMS
- contrib/src/gettext/rules.mak
- + contrib/src/goom/goom2k4-mmx-only.patch
- contrib/src/goom/rules.mak
- contrib/src/jpeg/SHA512SUMS
- contrib/src/jpeg/rules.mak
- contrib/src/live555/rules.mak
- contrib/src/orc/rules.mak
- contrib/src/schroedinger/rules.mak
- + contrib/src/schroedinger/schroedinger-disable-orcc.patch
Changes:
=====================================
contrib/src/gcrypt/rules.mak
=====================================
@@ -22,6 +22,10 @@ gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
# don't use getpid in UWP as it's not actually available
$(APPLY) $(SRC)/gcrypt/gcrypt-uwp-getpid.patch
+ifdef HAVE_CROSS_COMPILE
+ # disable cross-compiled command line tools that can't be run
+ sed -i.orig -e 's,^bin_PROGRAMS ,bin_PROGRAMS_disabled ,g'
$(UNPACK_DIR)/src/Makefile.am
+endif
$(MOVE)
=====================================
contrib/src/gettext/SHA512SUMS
=====================================
@@ -1 +1 @@
-e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04
gettext-0.22.tar.gz
+d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
gettext-0.22.5.tar.gz
=====================================
contrib/src/gettext/rules.mak
=====================================
@@ -1,5 +1,5 @@
# gettext
-GETTEXT_VERSION := 0.22
+GETTEXT_VERSION := 0.22.5
GETTEXT_URL := $(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
ifndef HAVE_WINSTORE # FIXME uses sys/socket.h improperly
@@ -15,6 +15,8 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
.sum-gettext: gettext-$(GETTEXT_VERSION).tar.gz
+GETTEXT_TOOLS_DIRS := gettext-runtime/src gettext-tools/src
+
gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
$(UNPACK)
# disable libtextstyle
@@ -30,6 +32,13 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
sed -i.orig -e 's,doc ,,' $(UNPACK_DIR)/gettext-runtime/Makefile.in
sed -i.orig -e 's,po man m4 tests,,'
$(UNPACK_DIR)/gettext-runtime/Makefile.in
sed -i.orig -e 's,doc ,,' $(UNPACK_DIR)/gettext-runtime/Makefile.in
+ifdef HAVE_CROSS_COMPILE
+ # disable cross-compiled command line tools that can't be run
+ sed -i.orig -e 's,install-binPROGRAMS install-exec-local,,'
$(UNPACK_DIR)/gettext-tools/src/Makefile.in
+ for subdir in $(GETTEXT_TOOLS_DIRS); do \
+ sed -i.orig -e 's,^bin_PROGRAMS = ,bin_PROGRAMS_disabled = ,g'
$(UNPACK_DIR)/$$subdir/Makefile.in && \
+ sed -i.orig -e 's,^noinst_PROGRAMS = ,noinst_PROGRAMS_disabled =
,g' $(UNPACK_DIR)/$$subdir/Makefile.in; done
+endif
$(MOVE)
DEPS_gettext = iconv $(DEPS_iconv) libxml2 $(DEPS_libxml2)
=====================================
contrib/src/goom/goom2k4-mmx-only.patch
=====================================
@@ -0,0 +1,29 @@
+--- goom/src/mmx.h.orig 2024-05-24 10:28:08.890273700 +0200
++++ goom/src/mmx.h 2024-05-24 10:28:33.482644400 +0200
+@@ -27,6 +27,8 @@
+ #ifndef _MMX_H
+ #define _MMX_H
+
++#define HAVE_FORCE_MMX 1
++
+ #include "goom_graphic.h"
+
+ /* Warning: at this writing, the version of GAS packaged
+@@ -63,6 +65,9 @@ typedef union {
+ static int
+ mm_support(void)
+ {
++#ifdef HAVE_FORCE_MMX
++ return 0x1; // MMX only
++#else /* HAVE_FORCE_MMX */
+ /* Returns 1 if MMX instructions are supported,
+ 3 if Cyrix MMX and Extended MMX instructions are supported
+ 5 if AMD MMX and 3DNow! instructions are supported
+@@ -223,6 +228,7 @@ mm_support(void)
+
+ /* Return */
+ return(rval);
++#endif /* HAVE_FORCE_MMX */
+ }
+
+ /* Function to test if mmx instructions are supported...
=====================================
contrib/src/goom/rules.mak
=====================================
@@ -20,6 +20,7 @@ goom: goom-$(GOOM_VERSION)-src.tar.gz .sum-goom
$(APPLY) $(SRC)/goom/goom2k4-0-memleaks.patch
$(APPLY) $(SRC)/goom/goom2k4-autotools.patch
$(APPLY) $(SRC)/goom/goom2k4-noxmmx.patch
+ $(APPLY) $(SRC)/goom/goom2k4-mmx-only.patch
$(APPLY) $(SRC)/goom/goom2k4-xmmslibdir.patch
ifdef HAVE_WIN32
ifdef MSYS_BUILD
=====================================
contrib/src/jpeg/SHA512SUMS
=====================================
@@ -1 +1 @@
-0efb7ce16333f4f3556b889bdd83b0f91697ce1645cbfb13db0c8a93ef47dd9cb0805c7160edaf946d4d54faf30a33bae90800c189e8b4bd44fcf3ce98179115
libjpeg-turbo-3.0.0.tar.gz
+46c44be837654e201d11bbf8d9fbb35b775a7d4bf653e9e709279437b10d5c8b0825ece4c8ee33f66689c263234fa2b08240fb5f5ba80e76e03891da8f64eda8
libjpeg-turbo-3.0.3.tar.gz
=====================================
contrib/src/jpeg/rules.mak
=====================================
@@ -1,6 +1,6 @@
# jpeg
-JPEG_VERSION := 3.0.0
+JPEG_VERSION := 3.0.3
JPEG_URL :=
$(GITHUB)/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$(JPEG_VERSION).tar.gz
$(TARBALLS)/libjpeg-turbo-$(JPEG_VERSION).tar.gz:
@@ -18,5 +18,6 @@ JPEG_CONF:= -DENABLE_SHARED=OFF -DWITH_TURBOJPEG=OFF
$(CMAKECLEAN)
$(HOSTVARS) $(CMAKE) $(JPEG_CONF)
+$(CMAKEBUILD)
- $(CMAKEINSTALL)
+ $(CMAKEINSTALL) --component lib
+ $(CMAKEINSTALL) --component include
touch $@
=====================================
contrib/src/live555/rules.mak
=====================================
@@ -90,17 +90,17 @@ endif
cd $(UNPACK_DIR) && sed -i.orig "s,LIBRARY_LINK =.*,LIBRARY_LINK =
$(AR) cr ,g" config.macosx*
mv live.$(LIVE555_VERSION) $@ && touch $@
-SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment
+LIVE555_SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment
.live555: live555
$(REQUIRE_GNUV3)
- cd $< && for subdir in $(SUBDIRS); do \
+ cd $< && for subdir in $(LIVE555_SUBDIRS); do \
echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
cd $< && echo "LIBDIR = $(PREFIX)/lib" >> Makefile.head && \
echo "PREFIX = $(PREFIX)" >> Makefile.head
cd $< && ./genMakefiles $(LIVE_TARGET)
- cd $< && for subdir in $(SUBDIRS); do $(MAKE) $(HOSTVARS) -C $$subdir;
done
- cd $< && for subdir in $(SUBDIRS); do $(MAKE) $(HOSTVARS) -C $$subdir
install; done
+ cd $< && for subdir in $(LIVE555_SUBDIRS); do $(MAKE) $(HOSTVARS) -C
$$subdir; done
+ cd $< && for subdir in $(LIVE555_SUBDIRS); do $(MAKE) $(HOSTVARS) -C
$$subdir install; done
$(MAKE) -C $< install_shared_libraries
touch $@
=====================================
contrib/src/orc/rules.mak
=====================================
@@ -26,6 +26,6 @@ orc: orc-$(ORC_VERSION).tar.gz .sum-orc
$(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ +$(MAKEBUILD) SUBDIRS=orc
+ +$(MAKEBUILD) SUBDIRS=orc install
touch $@
=====================================
contrib/src/schroedinger/rules.mak
=====================================
@@ -16,6 +16,8 @@ $(TARBALLS)/schroedinger-$(SCHROEDINGER_VERSION).tar.gz:
schroedinger: schroedinger-$(SCHROEDINGER_VERSION).tar.gz .sum-schroedinger
$(UNPACK)
$(APPLY) $(SRC)/schroedinger/schroedinger-notests.patch
+ # disable orc compilation, the old compiler matches what was used to
precompile
+ $(APPLY) $(SRC)/schroedinger/schroedinger-disable-orcc.patch
$(call pkg_static,"schroedinger.pc.in")
$(MOVE)
=====================================
contrib/src/schroedinger/schroedinger-disable-orcc.patch
=====================================
@@ -0,0 +1,11 @@
+--- schroedinger/configure.ac.orig 2024-05-24 11:11:32.059775800 +0200
++++ schroedinger/configure.ac 2024-05-24 11:11:46.999404400 +0200
+@@ -56,7 +56,7 @@ fi
+ SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER"
+ ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
+ AC_SUBST(ORCC)
+-AM_CONDITIONAL(HAVE_ORCC, test "x$cross_compiling" != xyes)
++AM_CONDITIONAL(HAVE_ORCC, test "x$cross_compiling" = none)
+
+ AC_ARG_WITH([thread],
+ AS_HELP_STRING([--with-thread=IMPL],[use threading library
{auto,pthread,gthread,win32,none} [[default=auto]]]),
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/cd09eb53a8201ea624db95d23073c34b69c64a33...1a2dfb8b7f53c07ae1c644c5fae1d1c5da59a96f
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/cd09eb53a8201ea624db95d23073c34b69c64a33...1a2dfb8b7f53c07ae1c644c5fae1d1c5da59a96f
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
