[packages/mplayer] - updated to 1.5 (now based on ffmpeg 5.1) - added live555-config patch (restore minimal configure s
qboosh
qboosh at pld-linux.org
Wed Apr 12 20:01:16 CEST 2023
commit 24bfe2fa0e3cc6094366a3be223683747c458849
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Apr 12 20:03:52 2023 +0200
- updated to 1.5 (now based on ffmpeg 5.1)
- added live555-config patch (restore minimal configure support for live555, which is now deprecated)
mplayer-check-byteswap.patch | 12 ++++++------
mplayer-ldflags.patch | 44 ++++++++++++++++++++++----------------------
mplayer-live555-async.patch | 17 -----------------
mplayer-live555-config.patch | 11 +++++++++++
mplayer-vstream.patch | 17 +++++++++--------
mplayer.spec | 18 +++++++++++-------
6 files changed, 59 insertions(+), 60 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index 748ac64..3b9d344 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -122,8 +122,8 @@ Summary(ko.UTF-8): 리눅스용 미디어플레이어
Summary(pl.UTF-8): Odtwarzacz filmów dla systemów uniksowych
Summary(pt_BR.UTF-8): Reprodutor de filmes
Name: mplayer
-Version: 1.4
-Release: 8
+Version: 1.5
+Release: 1
# DO NOT increase epoch unless it's really neccessary!
# especially such changes like pre7->pre7try2, increase Release instead!
# PS: $ rpmvercmp pre7try2 pre7
@@ -133,7 +133,7 @@ License: GPL
Group: Applications/Multimedia
# Source0: http://mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2
Source0: http://mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz
-# Source0-md5: 58d39f72bf7f3ddaa9e019224bffcb74
+# Source0-md5: 0419b64db24b6db0943dbc6afece7c44
%if 0
Source1: http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2
# Source1-md5: b1b71cc56b15da49cee1ede9a7b8134e
@@ -155,7 +155,7 @@ Patch12: %{name}-check-byteswap.patch
Patch13: %{name}-visibility-hidden-fix.patch
Patch14: cflags.patch
Patch15: %{name}-live555-async.patch
-
+Patch16: %{name}-live555-config.patch
Patch17: %{name}-gsm.patch
Patch19: %{name}-shared.patch
@@ -185,11 +185,13 @@ BuildRequires: OpenGL-GLX-devel
BuildRequires: a52dec-libs-devel
%{?with_aalib:BuildRequires: aalib-devel}
%{?with_alsa:BuildRequires: alsa-lib-devel}
+BuildRequires: aom-devel
%{?with_arts:BuildRequires: artsc-devel}
BuildRequires: binutils >= 2.10.1
%{?with_ssse3:BuildRequires: binutils >= 3:2.16.92}
BuildRequires: bzip2-devel
#%{?with_cdparanoia:BuildRequires: cdparanoia-III-devel}
+BuildRequires: dav1d-devel
%{?with_gnomess:BuildRequires: dbus-glib-devel}
%{?with_doc:BuildRequires: docbook-dtd45-xml}
%{?with_doc:BuildRequires: docbook-style-xsl}
@@ -199,7 +201,7 @@ BuildRequires: bzip2-devel
%{?with_esd:BuildRequires: esound-devel}
BuildRequires: faac-devel
%{?with_faad:BuildRequires: faad2-devel >= 2.0}
-%{?with_system_ffmpeg:BuildRequires: ffmpeg-devel >= 4.1}
+%{?with_system_ffmpeg:BuildRequires: ffmpeg-devel >= 5.1}
BuildRequires: fontconfig-devel >= 1:2.4.2
BuildRequires: freetype-devel >= 1:2.2.1
BuildRequires: fribidi-devel
@@ -244,6 +246,7 @@ BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel
# build >= 118
%{?with_x264:BuildRequires: libx264-devel >= 0.1.3}
+BuildRequires: libxml2-devel >= 2.0
BuildRequires: libxslt-progs
# with v4l2 headers
BuildRequires: linux-libc-headers >= 7:2.6.22
@@ -421,7 +424,7 @@ cp -f etc/codecs.conf etc/codecs.win32.conf
%patch13 -p1
%patch14 -p1
%patch15 -p1
-
+%patch16 -p1
%patch17 -p1
%{?with_shared:%patch19 -p1}
@@ -469,7 +472,7 @@ CONFIGADD
%build
CFLAGS="%{rpmcflags} %{?with_hidden_visibility:-fvisibility=hidden} %{?with_shared:-fvisibility=default -fPIC}"
-CFLAGS="$CFLAGS -I%{_includedir}/xvid%{?with_directfb: %{_includedir}/directfb} -DHAVE_GSM_H=1"
+CFLAGS="$CFLAGS -I%{_includedir}/xvid%{?with_directfb: -I%{_includedir}/directfb} -DHAVE_GSM_H=1"
# NOTE:
# - lircc refers to obsolete liblircc library (used in LIRCCD < 0.9)
@@ -532,6 +535,7 @@ build() {
%{__disable bs2b libbs2b} \
%{__disable libdts libdca} \
%{__disable libdv} \
+ %{__enable_disable live} \
%{__disable system_dvdcss libdvdcss-internal} \
%{__disable lzo liblzo} \
%{__disable system_libmpeg2 libmpeg2-internal} \
diff --git a/mplayer-check-byteswap.patch b/mplayer-check-byteswap.patch
index 2b4ac6b..fa9e492 100644
--- a/mplayer-check-byteswap.patch
+++ b/mplayer-check-byteswap.patch
@@ -1,6 +1,6 @@
---- MPlayer-1.4/configure.orig 2021-04-30 07:15:02.624028723 +0200
-+++ MPlayer-1.4/configure 2021-04-30 07:15:53.046668447 +0200
-@@ -3955,6 +3955,21 @@ fi
+--- MPlayer-1.5/configure.orig 2023-04-11 20:43:22.582368374 +0200
++++ MPlayer-1.5/configure 2023-04-11 20:44:20.978718680 +0200
+@@ -4193,6 +4193,21 @@ fi
echores "$_alloca"
@@ -22,11 +22,11 @@
echocheck "fastmemcpy"
if test "$_fastmemcpy" = yes ; then
def_fastmemcpy='#define CONFIG_FASTMEMCPY 1'
-@@ -8902,6 +8917,7 @@ $def_sys_uio_h
+@@ -9164,6 +9179,7 @@ $def_sys_uio_h
+ /* system headers */
$def_alloca_h
$def_altivec_h
- $def_malloc_h
+$def_byteswap_h
+ $def_malloc_h
$def_mman_h
$def_mman_has_map_failed
- $def_soundcard_h
diff --git a/mplayer-ldflags.patch b/mplayer-ldflags.patch
index 4dd3372..31b213d 100644
--- a/mplayer-ldflags.patch
+++ b/mplayer-ldflags.patch
@@ -1,6 +1,6 @@
---- MPlayer-1.4/configure.orig 2018-12-15 16:38:24.000000000 +0100
-+++ MPlayer-1.4/configure 2021-04-30 07:14:05.527706286 +0200
-@@ -595,7 +595,8 @@ Advanced options:
+--- MPlayer-1.5/configure.orig 2022-02-27 10:09:00.000000000 +0100
++++ MPlayer-1.5/configure 2023-04-11 20:38:37.187247826 +0200
+@@ -613,7 +613,8 @@ Advanced options:
Use these options if autodetection fails:
--extra-cflags=FLAGS extra CFLAGS
@@ -10,7 +10,7 @@
--extra-libs=FLAGS extra linker flags
--extra-libs-mplayer=FLAGS extra linker flags for MPlayer
--extra-libs-mencoder=FLAGS extra linker flags for MEncoder
-@@ -930,6 +931,9 @@ for ac_option do
+@@ -952,6 +953,9 @@ for ac_option do
--extra-cflags=*)
extra_cflags=$(option_value $ac_option)
;;
@@ -20,7 +20,7 @@
--extra-ldflags=*)
extra_ldflags=$(option_value $ac_option)
;;
-@@ -8024,7 +8028,7 @@ echores "$_crash_debug"
+@@ -8278,7 +8282,7 @@ echores "$_crash_debug"
echocheck "compiler support for noexecstack"
if cflag_check -Wl,-z,noexecstack ; then
@@ -29,32 +29,32 @@
echores "yes"
else
echores "no"
-@@ -8420,6 +8424,8 @@ CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cfl
+@@ -8682,6 +8686,8 @@ CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cfl
CFLAGS_STACKREALIGN = $cflags_stackrealign
CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
+LDFLAGS = $real_ldflags
+
- EXTRALIBS = $ld_static $extra_ldflags $timer_libs $extra_libs
- EXTRALIBS_MPLAYER = $libs_mplayer
- EXTRALIBS_MENCODER = $libs_mencoder
---- MPlayer-1.4/Makefile.orig 2018-04-11 12:26:39.000000000 +0200
-+++ MPlayer-1.4/Makefile 2021-04-30 07:14:33.362496825 +0200
-@@ -744,7 +744,7 @@ mencoder$(EXESUF): EXTRALIBS += $(EXTRAL
+ EXTRALIBS = $($filter_flags $ld_static $extra_ldflags $timer_libs $extra_libs)
+ EXTRALIBS_MPLAYER = $($filter_flags $libs_mplayer)
+ EXTRALIBS_MENCODER = $($filter_flags $libs_mencoder)
+--- MPlayer-1.5/Makefile.orig 2023-04-11 20:36:49.897829062 +0200
++++ MPlayer-1.5/Makefile 2023-04-11 20:41:46.636221492 +0200
+@@ -748,7 +748,7 @@ mencoder$(EXESUF): EXTRALIBS += $(EXTRAL
mplayer$(EXESUF): $(MPLAYER_DEPS)
mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
mencoder$(EXESUF) mplayer$(EXESUF):
-- $(CC) -o $@ $^ $(EXTRALIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
+- $(CC) $(CC_LINK_O) $^ $(EXTRALIBS)
++ $(CC) $(LDFLAGS) $(CC_LINK_O) $^ $(EXTRALIBS)
codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
-@@ -1028,7 +1028,7 @@ mplayer-nomain.o: mplayer.c
- TOOLS/netstream$(EXESUF): TOOLS/netstream.c
- TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
- TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
-- $(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
-+ $(CC) $(CC_DEPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
+@@ -790,7 +790,7 @@ version.h: version.sh $(wildcard .svn/en
+ ./$< `$(CC) -dumpversion`
- REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)
- REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
+ %$(EXESUF): %.c
+- $(CC) $(CC_DEPFLAGS) $(CFLAGS) $(CC_LINK_O) $^ $(LIBS)
++ $(CC) $(LDFLAGS) $(CC_DEPFLAGS) $(CFLAGS) $(CC_LINK_O) $^ $(LIBS)
+
+ %.ho: %.h
+ $(CC) $(CFLAGS) -Wno-unused -c $(CC_O) -x c $<
diff --git a/mplayer-live555-async.patch b/mplayer-live555-async.patch
index 21c7d6d..9834d4f 100644
--- a/mplayer-live555-async.patch
+++ b/mplayer-live555-async.patch
@@ -109,20 +109,3 @@ index 018327c..4fa7efe 100644
} else if (rtpState->sipClient != NULL) {
rtpState->sipClient->sendBYE();
}
---- mplayer-export-2014-09-12/configure.orig 2014-09-16 18:01:19.226447596 +0200
-+++ mplayer-export-2014-09-12/configure 2014-09-17 20:53:29.359054882 +0200
-@@ -7049,13 +7049,12 @@
- echocheck "LIVE555 Streaming Media libraries"
- if test "$_live" = auto && test "$networking" = yes ; then
- cat > $TMPCPP << EOF
--#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
- #include <liveMedia.hh>
- #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
- #error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
- #endif
- #include "BasicUsageEnvironment.hh"
--int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), 0, "", 0); return 0; }
-+int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), "", 0, "", 0); return 0; }
- EOF
-
- _live=no
diff --git a/mplayer-live555-config.patch b/mplayer-live555-config.patch
new file mode 100644
index 0000000..00270f6
--- /dev/null
+++ b/mplayer-live555-config.patch
@@ -0,0 +1,11 @@
+--- MPlayer-1.5/configure.orig 2023-04-11 21:32:54.206269705 +0200
++++ MPlayer-1.5/configure 2023-04-12 06:22:00.634312397 +0200
+@@ -7374,6 +7374,8 @@ echores "$_nemesi"
+ echocheck "LIVE555 Streaming Media libraries"
+ if test "$_live" = yes && test "$networking" = yes; then
+ def_live='#define CONFIG_LIVE555 1'
++ extra_ldflags="$extra_ldflags -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment -lstdc++"
++ extra_cxxflags="$extra_cxxflags -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
+ inputmodules="live555 $inputmodules"
+ else
+ _live=no
diff --git a/mplayer-vstream.patch b/mplayer-vstream.patch
index df36adb..c81cc05 100644
--- a/mplayer-vstream.patch
+++ b/mplayer-vstream.patch
@@ -1,6 +1,6 @@
---- MPlayer-1.1/configure.orig 2013-02-24 19:30:58.149114471 +0100
-+++ MPlayer-1.1/configure 2013-02-24 19:44:59.449079165 +0100
-@@ -7435,7 +7435,7 @@
+--- MPlayer-1.5/configure.orig 2023-04-11 20:46:25.264712032 +0200
++++ MPlayer-1.5/configure 2023-04-11 20:47:41.344299874 +0200
+@@ -8106,7 +8106,7 @@ fi
if test "$_vstream" = yes ; then
def_vstream='#define CONFIG_VSTREAM 1'
inputmodules="vstream $inputmodules"
@@ -9,11 +9,12 @@
else
noinputmodules="vstream $noinputmodules"
def_vstream='#undef CONFIG_VSTREAM'
-@@ -8344,6 +8344,7 @@ CFLAGS_SVGALIB_HELPER = $cflags_svgal
+@@ -8699,7 +8699,7 @@ CFLAGS_SVGALIB_HELPER = $cflags_svgal
+
LDFLAGS = $real_ldflags
- EXTRALIBS = $ld_static $extra_ldflags $timer_libs $extra_libs
-+EXTRALIBS = $extra_ldflags $ndextra_ldflags $ld_static $timer_libs $extra_libs
- EXTRALIBS_MPLAYER = $libs_mplayer
- EXTRALIBS_MENCODER = $libs_mencoder
+-EXTRALIBS = $($filter_flags $ld_static $extra_ldflags $timer_libs $extra_libs)
++EXTRALIBS = $($filter_flags $extra_ldflags $ndextra_ldflags $ld_static $timer_libs $extra_libs)
+ EXTRALIBS_MPLAYER = $($filter_flags $libs_mplayer)
+ EXTRALIBS_MENCODER = $($filter_flags $libs_mencoder)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mplayer.git/commitdiff/24bfe2fa0e3cc6094366a3be223683747c458849
More information about the pld-cvs-commit
mailing list