[packages/mplayer] Revert "Unify configure options to make sure that features are actually enabled/disabled"
baggins
baggins at pld-linux.org
Fri Aug 15 23:59:36 CEST 2025
commit bd713fbbcedca5b03d64a2cc5621d4318ede725a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Aug 16 01:58:24 2025 +0200
Revert "Unify configure options to make sure that features are actually enabled/disabled"
I haven't realized how broken the configure script is here...
mplayer-ldflags.patch | 64 ------------------------------
mplayer.spec | 105 +++++++++++++++++++++++++-------------------------
2 files changed, 52 insertions(+), 117 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index bc8f0c7..7c51faf 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -14,7 +14,8 @@
%bcond_without cdparanoia # cdparanoia support (when libcdio not enabled)
%bcond_without doc # don't build docs (slow)
%bcond_without dvdnav # dvdnav support
-%bcond_without dvdread # libdvdread support
+%bcond_without system_dvdcss # system libdvdcss library (instead of internal copy)
+%bcond_without system_dvdread # system libdvdread library (instead of internal copy)
%bcond_without enca # disable using ENCA charset oracle library
%bcond_without gui # without GTK+ GUI
%bcond_without joystick # joystick support
@@ -225,9 +226,9 @@ BuildRequires: libass-devel >= 0.9.10
%{?with_crystalhd:BuildRequires: libcrystalhd-devel}
%{?with_libdts:BuildRequires: libdts-devel}
%{?with_libdv:BuildRequires: libdv-devel > 0.9.5}
-BuildRequires: libdvdcss-devel
+#%{?with_system_dvdcss:BuildRequires: libdvdcss-devel}
%{?with_dvdnav:BuildRequires: libdvdnav-devel >= 4.1.3}
-%{?with_dvdread:BuildRequires: libdvdread-devel >= 4.1}
+%{?with_system_dvdread:BuildRequires: libdvdread-devel >= 4.1}
%{?with_ggi:BuildRequires: libggi-devel}
%{?with_ggi:BuildRequires: libggiwmh-devel}
BuildRequires: libgsm-devel
@@ -488,9 +489,6 @@ CONFIGADD
%build
CFLAGS="%{rpmcflags} %{?with_hidden_visibility:-fvisibility=hidden} %{?with_shared:-fvisibility=default -fPIC}"
CFLAGS="$CFLAGS -I%{_includedir}/xvid%{?with_directfb: -I%{_includedir}/directfb} -DHAVE_GSM_H=1"
-%{?with_bs2b:CFLAGS="$CFLAGS -I%{_includedir}/bs2b"}
-%{?with_smb:CFLAGS="$CFLAGS $(pkg-config --cflags smbclient)"}
-%{?with_openjpeg:CFLAGS="$CFLAGS $(pkg-config --cflags libopenjp2)"}
# NOTE:
# - lircc refers to obsolete liblircc library (used in LIRCCD < 0.9)
@@ -521,86 +519,87 @@ build() {
--disable-sse \
--disable-sse2 \
%endif
- %{__enable_disable ssse3} \
+ %{__disable ssse3} \
%ifarch ppc
- %{__enable_disable altivec} \
+ %{__disable altivec} \
%endif
- %{__enable_disable aalib aa} \
+ %{__disable aalib aa} \
%{__enable_disable alsa} \
- %{__enable_disable arts} \
- %{__enable_disable bluray} \
- %{__enable_disable caca} \
- %{__enable_disable cdparanoia} \
+ %{__disable arts} \
+ %{__disable bluray} \
+ %{__disable caca} \
+ %{__disable cdparanoia} \
--enable-dga1 \
--enable-dga2 \
%{__enable_disable directfb} \
%{__enable_disable dvdnav} \
- %{__enable_disable dvdread dvdread} \
- %{__enable_disable dxr2} \
- %{__enable_disable dxr3} \
+ %{__disable system_dvdread dvdread-internal} \
+ %{__disable dxr2} \
+ %{__disable dxr3} \
--enable-dynamic-plugins \
- %{__enable_disable enca} \
- %{__enable_disable esd} \
- %{__enable_disable faad} \
+ %{__disable enca} \
+ %{__disable esd} \
+ %{__disable faad} \
--enable-fbdev \
- %{__enable_disable gif} \
+ %{__disable gif} \
--enable-gl \
- %{__enable_disable ggi} \
- %{__enable_disable jack} \
- %{__enable_disable joystick} \
- %{__enable_disable cdio libcdio} \
- %{__enable_disable ladspa} \
- %{__enable_disable bs2b libbs2b} \
- %{__enable_disable libdts libdca} \
- %{__enable_disable libdv} \
- %{__enable_disable lzo liblzo} \
- %{__enable_disable system_libmpeg2 libmpeg2-internal} \
- %{__enable_disable nemesi} \
+ %{__disable ggi} \
+ %{__disable jack} \
+ %{__enable joystick} \
+ %{__disable cdio libcdio} \
+ %{__disable ladspa} \
+ %{__disable bs2b libbs2b} \
+ %{__disable libdts libdca} \
+ %{__disable libdv} \
+ %{__disable system_dvdcss libdvdcss-internal} \
+ %{__disable lzo liblzo} \
+ %{__disable system_libmpeg2 libmpeg2-internal} \
+ %{__disable nemesi} \
%{__enable_disable amr libopencore_amrnb} %{__enable_disable amr libopencore_amrwb} \
- %{__enable_disable openjpeg libopenjpeg} \
- %{__enable_disable rtmp librtmp} \
- %{__enable_disable vorbis libvorbis} \
+ %{__disable openjpeg} \
+ %{__disable rtmp librtmp} \
+ %{__disable vorbis libvorbis} \
%{__enable_disable lirc} \
--disable-lircc \
%{__enable_disable live} \
- %{__enable_disable mad} \
- %{__enable_disable mencoder} \
- %{__enable_disable osd menu} \
+ %{__disable mad} \
+ %{__disable mencoder} \
+ %{__enable osd menu} \
--enable-mga \
- %{__enable_disable mpg123} \
- %{__enable_disable musepack} \
- %{__enable_disable nas} \
- %{__enable_disable pulseaudio pulse} \
- %{__enable_disable quicktime qtx} \
+ %{__disable mpg123} \
+ %{__enable musepack} \
+ %{__disable nas} \
+ %{__disable pulseaudio pulse} \
+ %{__disable quicktime qtx} \
--enable-radio \
--enable-radio-capture \
- %{__enable_disable real} \
+ %{__disable real} \
%{__enable_disable runtime runtime-cpudetection} \
%{__enable_disable sdl} \
- %{__enable_disable select} \
+ %{__disable select} \
--enable-s3fb \
- %{__enable_disable smb} \
- %{__enable_disable svga} \
+ %{__disable smb} \
+ %{__disable svga} \
--enable-tdfxfb \
--enable-tdfxvid \
- %{__enable_disable theora} \
+ %{__disable theora} \
--disable-toolame \
%{!?with_tremor:--disable-tremor} \
--enable-unrarexec \
- %{__enable_disable vdpau} \
- %{__enable_disable vidix} \
- %{__enable_disable vstream} \
+ %{__disable vdpau} \
+ %{__disable vidix} \
+ %{__disable vstream} \
--enable-vm \
%ifarch ppc
--enable-wii \
%endif
- %{__enable_disable win32 win32dll} \
+ %{__disable win32 win32dll} \
--enable-x11 \
- %{__enable_disable x264} \
+ %{__disable x264} \
--enable-xmga \
%{?with_xmms:--enable-xmms --with-xmmsplugindir=%{_libdir}/xmms/Input --with-xmmslibdir=%{_libdir}} \
--enable-xv \
- %{__enable_disable xvid} \
+ %{__disable xvid} \
--enable-xvmc --with-xvmclib=XvMCW \
%{__enable_disable zr} \
"$@"
diff --git a/mplayer-ldflags.patch b/mplayer-ldflags.patch
index a2f218b..31b213d 100644
--- a/mplayer-ldflags.patch
+++ b/mplayer-ldflags.patch
@@ -20,70 +20,6 @@
--extra-ldflags=*)
extra_ldflags=$(option_value $ac_option)
;;
-@@ -6486,6 +6486,13 @@
- echores "$_bluray"
-
- echocheck "dvdread"
-+if test "$_dvdread" = yes ; then
-+ _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
-+ _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null)
-+ extra_cflags="$extra_cflags $_dvdreadcflags"
-+ extra_ldflags="$extra_ldflags $_dvdreadlibs"
-+fi
-+echocheck "dvdread"
- if test "$_dvdread" = auto ; then
- _dvdread=no
- _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
-@@ -6939,6 +6939,9 @@
- extra_ldflags="$extra_ldflags -logg -lvorbisidec"
- elif test "$_libvorbis" = yes ; then
- _vorbis=yes
-+ for vorbislibs in '-lvorbisenc -lvorbis -logg' '-lvorbis -logg' ; do
-+ statement_check vorbis/vorbisenc.h 'vorbis_encode_ctl(0, 0, 0); ogg_stream_clear(0)' $vorbislibs && _libvorbis=yes && break
-+ done
- def_vorbis='#define CONFIG_OGGVORBIS 1'
- codecmodules="libvorbis $codecmodules"
- res_comment="libvorbis"
-@@ -7023,11 +7023,12 @@
- if test "$_mpg123" = auto; then
- _mpg123=no
- statement_check mpg123.h 'mpg123_param(NULL, MPG123_RESYNC_LIMIT, -1, 0.)' -lmpg123 &&
-- _mpg123=yes && extra_ldflags="$extra_ldflags -lmpg123"
-+ _mpg123=yes
- fi
- if test "$_mpg123" = yes ; then
- def_mpg123='#define CONFIG_MPG123 1'
- codecmodules="mpg123 $codecmodules"
-+ extra_ldflags="$extra_ldflags -lmpg123"
- else
- nocodecmodules="mpg123 $nocodecmodules"
- fi
-@@ -7038,11 +7039,12 @@
- if test "$_liba52" = auto ; then
- _liba52=no
- statement_check_broken inttypes.h a52dec/a52.h 'a52_state_t *testHand; testHand=a52_init(0)' -la52 &&
-- _liba52=yes && extra_ldflags="$extra_ldflags -la52"
-+ _liba52=yes
- fi
- if test "$_liba52" = yes ; then
- def_liba52='#define CONFIG_LIBA52 1'
- codecmodules="liba52 $codecmodules"
-+ extra_ldflags="$extra_ldflags -la52"
- else
- nocodecmodules="liba52 $nocodecmodules"
- fi
-@@ -7066,7 +7068,10 @@
- if test "$_libmpeg2" = auto ; then
- _libmpeg2=no
- header_check_broken stdint.h mpeg2dec/mpeg2.h -lmpeg2 &&
-- _libmpeg2=yes && extra_ldflags="$extra_ldflags -lmpeg2"
-+ _libmpeg2=yes
-+fi
-+if test "$_libmpeg2" = yes ; then
-+ extra_ldflags="$extra_ldflags -lmpeg2"
- fi
-
- def_libmpeg2='#undef CONFIG_LIBMPEG2'
@@ -8278,7 +8282,7 @@ echores "$_crash_debug"
echocheck "compiler support for noexecstack"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mplayer.git/commitdiff/bd713fbbcedca5b03d64a2cc5621d4318ede725a
More information about the pld-cvs-commit
mailing list