Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
234a0209 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: libdsm: remove unused LIBDSM_CONF variable
Obsolete since 305eae38b30be838235577229a7a81aa7885b557
- - - - -
d8b338b5 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: fluidlite: don't build the shared library version
- - - - -
1b26bda0 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: jpeg: don't change dir when calling ranlib with a prefixed path
- - - - -
3f557ee5 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: x264: use HOSTCONF for common autotools parameters
- - - - -
2b45932a by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: x264: remove configure setting found in HOSTCONF
- - - - -
ebdae4ea by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: gpg-error: remove configure setting found in HOSTCONF
- - - - -
4dce5d8e by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: ass: remove forced -O3
This shouldn't be enforced. We already use -O2 on release builds.
Introduced in 77f2dac1abc04ba5b1dc040c6cf90325622828fa
- - - - -
6240c4ce by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: mad: remove forced -O3
This shouldn't be enforced. We already use -O2 on release builds.
-O4 was removed in 8d09802392b674ea6ae7993c20e6f725b0d7a86c
-O3 was added with the contrib in 9c0b836a35bced0ede45054b85640694f54faeaa
- - - - -
6fa63706 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: gettext: remove extra CFLAGS with no extra
It's already part of HOSTVARS.
- - - - -
6fe9dfe0 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: vpx: remove unused VPX_CFLAGS variable
- - - - -
c637a0bd by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: do successive builds separately
- - - - -
c90f339c by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: fontconfig: remove unknown --with-config option
As witnessed in https://code.videolan.org/robUx4/vlc/-/jobs/1142085/raw
> configure: WARNING: unrecognized options: --disable-examples,
--disable-doc, --disable-tests, --with-confdir
- - - - -
e1fbdf0d by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: dca: don't force antique C style code
It should work with default C99(?) standard.
If not it can be fixed and upstreamed at
https://code.videolan.org/videolan/libdca
- - - - -
afdc3976 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: iconv: don't build with forced old inline style
It should have been updated to modern C since then.
- - - - -
a371bda5 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: flac: disable examples building
- - - - -
1209a51c by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: gcrypt: fix disable-doc typo
- - - - -
0d5e38ce by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: gpg-error: disable documentation building
- - - - -
7ebe6644 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: ass: disable tests
And fix fribidi dependencies
- - - - -
42df81fb by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: caca: enable debug in debug builds
- - - - -
77abf4cc by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: dca: remove stray change directory
- - - - -
9d97a25c by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: iconv: remove unsupported --disable-nls option
- - - - -
f82c5e17 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: iconv: simplify the UPDATE_AUTOCONFIG copies
- - - - -
c33d02f7 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: dvdnav: remove unknown option --disable-examples
- - - - -
c6d69dca by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: do change directory in one pass
The -C option emits a log when changing to a new directory. We don't need
two
logs when we want to build in a single folder.
- - - - -
b0ccb6e1 by Steve Lhomme at 2022-09-20T04:48:40+00:00
contrib: separate UPDATE_AUTOCONFIG and extra autoconf files handling
They are related but they don't have to be in a single line.
- - - - -
24 changed files:
- contrib/src/ass/rules.mak
- contrib/src/caca/rules.mak
- contrib/src/dca/rules.mak
- contrib/src/dvbpsi/rules.mak
- contrib/src/dvdnav/rules.mak
- contrib/src/flac/rules.mak
- contrib/src/fluidlite/rules.mak
- contrib/src/fontconfig/rules.mak
- contrib/src/gcrypt/rules.mak
- contrib/src/gettext/rules.mak
- contrib/src/gpg-error/rules.mak
- contrib/src/iconv/rules.mak
- contrib/src/jpeg/rules.mak
- contrib/src/libdsm/rules.mak
- contrib/src/libmpeg2/rules.mak
- contrib/src/mad/rules.mak
- contrib/src/pthreads/rules.mak
- contrib/src/qt/rules.mak
- contrib/src/samplerate/rules.mak
- contrib/src/tiff/rules.mak
- contrib/src/twolame/rules.mak
- contrib/src/vpx/rules.mak
- contrib/src/x262/rules.mak
- contrib/src/x264/rules.mak
Changes:
=====================================
contrib/src/ass/rules.mak
=====================================
@@ -38,8 +38,9 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
$(MOVE)
-DEPS_ass = freetype2 $(DEPS_freetype2) fribidi iconv $(DEPS_iconv)
+DEPS_ass = freetype2 $(DEPS_freetype2) fribidi $(DEPS_fribidi) iconv
$(DEPS_iconv)
+ASS_CONF = --disable-test
ifneq ($(WITH_FONTCONFIG), 0)
DEPS_ass += fontconfig $(DEPS_fontconfig)
else
@@ -60,14 +61,8 @@ ifeq ($(WITH_ASS_ASM), 0)
ASS_CONF += --disable-asm
endif
-ifdef WITH_OPTIMIZATION
-ASS_CFLAGS += -O3
-else
-ASS_CFLAGS += -g
-endif
-
.ass: libass
- cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(ASS_CFLAGS)" ./configure
$(HOSTCONF) $(ASS_CONF)
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(ASS_CONF)
cd $< && $(MAKE)
$(call pkg_static,"libass.pc")
cd $< && $(MAKE) install
=====================================
contrib/src/caca/rules.mak
=====================================
@@ -46,6 +46,9 @@ CACA_CONF := \
ifdef HAVE_MACOSX
CACA_CONF += --disable-x11
endif
+ifndef WITH_OPTIMIZATION
+CACA_CONF += --enable-debug
+endif
ifdef HAVE_WIN32
CACA_CONF += --disable-ncurses \
ac_cv_func_vsnprintf_s=yes \
=====================================
contrib/src/dca/rules.mak
=====================================
@@ -19,14 +19,14 @@ $(TARBALLS)/libdca-$(DCA_VERSION).tar.bz2:
libdca: libdca-$(DCA_VERSION).tar.bz2 .sum-dca
$(UNPACK)
- $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR)
+ $(UPDATE_AUTOCONFIG)
$(call pkg_static,"./libdca/libdca.pc.in")
$(MOVE)
.dca: libdca
$(REQUIRE_GPL)
$(RECONF)
- cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -std=gnu89" ./configure
$(HOSTCONF)
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) -C include install
cd $< && $(MAKE) -C libdca install
rm -f $(PREFIX)/lib/libdts.a
=====================================
contrib/src/dvbpsi/rules.mak
=====================================
@@ -15,7 +15,8 @@ $(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(UNPACK)
- $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub
.auto
+ $(UPDATE_AUTOCONFIG)
+ cd $(UNPACK_DIR) && mv config.guess config.sub .auto
$(APPLY) $(SRC)/dvbpsi/dvbpsi-noexamples.patch
$(APPLY) $(SRC)/dvbpsi/dvbpsi-sys-types.patch
$(APPLY) $(SRC)/dvbpsi/0001-really-identify-duplicates.patch
=====================================
contrib/src/dvdnav/rules.mak
=====================================
@@ -29,6 +29,6 @@ DEPS_dvdnav = dvdread $(DEPS_dvdread)
.dvdnav: dvdnav
$(REQUIRE_GPL)
$(RECONF) -I m4
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
=====================================
contrib/src/flac/rules.mak
=====================================
@@ -36,6 +36,7 @@ endif
$(MOVE)
FLACCONF := $(HOSTCONF) \
+ --disable-examples \
--disable-thorough-tests \
--disable-doxygen-docs \
--disable-xmms-plugin \
@@ -60,5 +61,6 @@ DEPS_flac = ogg $(DEPS_ogg)
cd $< && $(AUTORECONF)
cd $< && $(HOSTVARS) CFLAGS="$(FLAC_CFLAGS)" ./configure $(FLACCONF)
cd $< && $(MAKE) -C include install
- cd $< && $(MAKE) -C src/libFLAC install && $(MAKE) -C src/share install
+ cd $< && $(MAKE) -C src/libFLAC install
+ cd $< && $(MAKE) -C src/share install
touch $@
=====================================
contrib/src/fluidlite/rules.mak
=====================================
@@ -25,8 +25,10 @@ fluidlite: fluidlite-$(FLUID_HASH).tar.xz .sum-fluidlite
$(APPLY) $(SRC)/fluidlite/add-pic.diff
$(MOVE)
+FLUIDLITE_CONF := -DFLUIDLITE_BUILD_SHARED=OFF
+
.fluidlite: fluidlite toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS) $(CMAKE)
+ $(HOSTVARS) $(CMAKE) $(FLUIDLITE_CONF)
+$(CMAKEBUILD) --target install
touch $@
=====================================
contrib/src/fontconfig/rules.mak
=====================================
@@ -42,7 +42,6 @@ endif
ifdef HAVE_MACOSX
FONTCONFIG_CONF += \
--with-cache-dir=~/Library/Caches/fontconfig \
- --with-confdir=/usr/X11/lib/X11/fonts \
--with-default-fonts=/System/Library/Fonts \
--with-add-fonts=/Library/Fonts,~/Library/Fonts
# libxml2 without pkg-config...
=====================================
contrib/src/gcrypt/rules.mak
=====================================
@@ -39,7 +39,7 @@ GCRYPT_CONF = \
--enable-ciphers=aes,des,rfc2268,arcfour \
--enable-digests=sha1,md5,rmd160,sha256,sha512 \
--enable-pubkey-ciphers=dsa,rsa,ecc \
- --disable-docs
+ --disable-doc
ifdef HAVE_WIN32
ifeq ($(ARCH),x86_64)
=====================================
contrib/src/gettext/rules.mak
=====================================
@@ -23,7 +23,6 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
DEPS_gettext = iconv $(DEPS_iconv) libxml2 $(DEPS_libxml2)
-GETTEXT_CFLAGS := $(CFLAGS)
GETTEXT_CONF = \
--disable-relocatable \
--disable-java \
@@ -38,7 +37,7 @@ endif
.gettext: gettext
cd $< && cd gettext-runtime && $(AUTORECONF)
cd $< && cd gettext-tools && $(AUTORECONF)
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(GETTEXT_CFLAGS)"
$(GETTEXT_CONF)
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GETTEXT_CONF)
ifndef HAVE_ANDROID
cd $< && $(MAKE) install
else
=====================================
contrib/src/gpg-error/rules.mak
=====================================
@@ -33,9 +33,9 @@ endif
GPGERROR_CONF := $(HOSTCONF) \
--disable-nls \
- --disable-shared \
--disable-languages \
- --disable-tests
+ --disable-tests \
+ --disable-doc
.gpg-error: libgpg-error
$(RECONF)
=====================================
contrib/src/iconv/rules.mak
=====================================
@@ -24,11 +24,12 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
$(UNPACK)
$(APPLY) $(SRC)/iconv/win32.patch
$(APPLY) $(SRC)/iconv/bins.patch
- $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub
build-aux
- $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub
libcharset/build-aux
+ $(UPDATE_AUTOCONFIG)
+ cd $(UNPACK_DIR) && cp config.guess config.sub build-aux \
+ && mv config.guess config.sub libcharset/build-aux
$(MOVE)
.iconv: iconv
- cd $< && $(HOSTVARS) ./configure CFLAGS="$(CFLAGS) -fgnu89-inline"
$(HOSTCONF) --disable-nls
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
=====================================
contrib/src/jpeg/rules.mak
=====================================
@@ -19,5 +19,5 @@ jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
- cd $< && if test -e $(PREFIX)/lib/libjpeg.a; then $(RANLIB)
$(PREFIX)/lib/libjpeg.a; fi
+ if test -e $(PREFIX)/lib/libjpeg.a; then $(RANLIB)
$(PREFIX)/lib/libjpeg.a; fi
touch $@
=====================================
contrib/src/libdsm/rules.mak
=====================================
@@ -10,11 +10,6 @@ endif
$(TARBALLS)/libdsm-$(LIBDSM_VERSION).tar.xz:
$(call download_pkg,$(LIBDSM_URL),libdsm)
-LIBDSM_CONF = $(HOSTCONF)
-
-ifndef WITH_OPTIMIZATION
-LIBDSM_CONF += --enable-debug
-endif
.sum-libdsm: libdsm-$(LIBDSM_VERSION).tar.xz
libdsm: libdsm-$(LIBDSM_VERSION).tar.xz .sum-libdsm
=====================================
contrib/src/libmpeg2/rules.mak
=====================================
@@ -20,7 +20,8 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2
$(APPLY) $(SRC)/libmpeg2/libmpeg2-arm-pld.patch
$(APPLY) $(SRC)/libmpeg2/libmpeg2-inline.patch
$(APPLY) $(SRC)/libmpeg2/libmpeg2-mc-neon.patch
- $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub
.auto
+ $(UPDATE_AUTOCONFIG)
+ cd $(UNPACK_DIR) && mv config.guess config.sub .auto
$(MOVE)
.libmpeg2: libmpeg2
=====================================
contrib/src/mad/rules.mak
=====================================
@@ -19,7 +19,7 @@ endif
$(TARBALLS)/libmad-$(MAD_VERSION).tar.gz:
$(call download,$(MAD_URL))
-LIBMAD_VARS := CFLAGS="$(CFLAGS) -O3"
+LIBMAD_VARS :=
ifdef HAVE_IOS
LIBMAD_VARS += CCAS="$(AS)"
endif
=====================================
contrib/src/pthreads/rules.mak
=====================================
@@ -49,7 +49,7 @@ pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2 .sum-pthreads
.pthreads: pthreads
cd $</mingw-w64-libraries/winpthreads && $(HOSTVARS) ./configure
$(HOSTCONF)
- cd $< && $(MAKE) -C mingw-w64-libraries -C winpthreads install
+ cd $< && $(MAKE) -C mingw-w64-libraries/winpthreads install
touch $@
.sum-winrt_headers: .sum-pthreads
=====================================
contrib/src/qt/rules.mak
=====================================
@@ -133,7 +133,7 @@ QT_QINSTALL="$(shell cd $(SRC)/qt/; pwd
-P)/install_wrapper.sh"
sub-uic-install_subtargets \
sub-qlalr-install_subtargets
# Install plugins
- cd $< && $(MAKE) -C src -C plugins \
+ cd $< && $(MAKE) -C src/plugins \
INSTALL_FILE=$(QT_QINSTALL) VLC_PREFIX="$(PREFIX)" \
sub-imageformats-install_subtargets \
sub-platforms-install_subtargets \
=====================================
contrib/src/samplerate/rules.mak
=====================================
@@ -16,11 +16,13 @@ $(TARBALLS)/libsamplerate-$(SAMPLERATE_VERSION).tar.gz:
samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
$(UNPACK)
- $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub
Cfg
+ $(UPDATE_AUTOCONFIG)
+ cd $(UNPACK_DIR) && mv config.guess config.sub Cfg
$(MOVE)
.samplerate: samplerate
$(REQUIRE_GPL)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
- cd $< && $(MAKE) -C src install && $(MAKE) install-data
+ cd $< && $(MAKE) -C src install
+ cd $< && $(MAKE) install-data
touch $@
=====================================
contrib/src/tiff/rules.mak
=====================================
@@ -21,6 +21,7 @@ tiff: tiff-$(TIFF_VERSION).tar.gz .sum-tiff
--disable-zlib \
--disable-cxx \
--without-x
- cd $< && $(MAKE) -C port && $(MAKE) -C libtiff
+ cd $< && $(MAKE) -C port
+ cd $< && $(MAKE) -C libtiff
cd $< && $(MAKE) -C libtiff install
touch $@
=====================================
contrib/src/twolame/rules.mak
=====================================
@@ -17,7 +17,8 @@ $(TARBALLS)/twolame-$(TWOLAME_VERSION).tar.gz:
twolame: twolame-$(TWOLAME_VERSION).tar.gz .sum-twolame
$(UNPACK)
- $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && cp config.guess config.sub
build-scripts
+ $(UPDATE_AUTOCONFIG)
+ cd $(UNPACK_DIR) && cp config.guess config.sub build-scripts
$(MOVE)
.twolame: twolame
=====================================
contrib/src/vpx/rules.mak
=====================================
@@ -136,9 +136,7 @@ endif
endif
endif
-ifdef WITH_OPTIMIZATION
-VPX_CFLAGS += -DNDEBUG
-else
+ifndef WITH_OPTIMIZATION
VPX_CONF += --disable-optimizations
endif
=====================================
contrib/src/x262/rules.mak
=====================================
@@ -29,7 +29,7 @@ x262: $(TARBALLS)/x262-git.tar.xz .sum-x262
$(REQUIRE_GPL)
cd $< && sed -i -e 's/x264/x262/g' configure
cd $< && sed -i -e 's/x264_config/x262_config/g' *.h Makefile *.c
- cd $< && $(HOSTVARS) ./configure $(X264CONF)
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(X264CONF)
cd $< && sed -i -e 's/x264.pc/x262.pc/g' Makefile
cd $< && sed -i -e 's/x264.h/x262.h/g' Makefile
cd $< && $(MAKE)
=====================================
contrib/src/x264/rules.mak
=====================================
@@ -20,8 +20,7 @@ endif
PKGS_ALL += x26410b
-X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" \
- --enable-static \
+X264CONF = \
--disable-avs \
--disable-lavf \
--disable-cli \
@@ -81,7 +80,7 @@ x264 x26410b: %: $(X264_BASENAME) .sum-%
.x264: x264
$(REQUIRE_GPL)
- cd $< && $(HOSTVARS) $(X264_AS) ./configure $(X264CONF)
+ cd $< && $(HOSTVARS) $(X264_AS) ./configure $(HOSTCONF) $(X264CONF)
cd $< && $(MAKE) install
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/15bf12a0f3551397030bedd175bd15ad498c349a...b0ccb6e165c9eb342bbbb869ab14b8891539bb88
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/15bf12a0f3551397030bedd175bd15ad498c349a...b0ccb6e165c9eb342bbbb869ab14b8891539bb88
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