From ca4383fa88baea41da91e9bd3dd905a9fc715fb8 Mon Sep 17 00:00:00 2001 From: miqlas Date: Tue, 18 Apr 2017 19:25:32 +0200 Subject: [PATCH] Mplayer 1.3.0 fix (#1281) Recipe cleanup, reduced REQs, fixed PNG, etc. --- media-video/mplayer/mplayer-1.3.0.recipe | 87 +++++++++++++++--------- 1 file changed, 53 insertions(+), 34 deletions(-) diff --git a/media-video/mplayer/mplayer-1.3.0.recipe b/media-video/mplayer/mplayer-1.3.0.recipe index c72aafc73..a16432ecc 100644 --- a/media-video/mplayer/mplayer-1.3.0.recipe +++ b/media-video/mplayer/mplayer-1.3.0.recipe @@ -28,7 +28,7 @@ CHECKSUM_SHA256="3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b0984 SOURCE_DIR="MPlayer-$portVersion" PATCHES="mplayer_x86-1.3.0.patchset" -ARCHITECTURES="x86_gcc2 x86 x86_64" +ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -38,27 +38,26 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - ffmpeg$secondaryArchSuffix cdrtools$secondaryArchSuffix - #lib:live555$secondaryArchSuffix + lib:libavcodec$secondaryArchSuffix + lib:libavformat$secondaryArchSuffix + lib:libavutil$secondaryArchSuffix lib:liba52$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libcaca$secondaryArchSuffix - #lib:libcddb$secondaryArchSuffix - lib:libcdio$secondaryArchSuffix +# lib:libcdio$secondaryArchSuffix lib:libdca$secondaryArchSuffix lib:libdv$secondaryArchSuffix lib:libdvdcss$secondaryArchSuffix lib:libdvdnav$secondaryArchSuffix lib:libdvdread$secondaryArchSuffix + lib:libenca$secondaryArchSuffix lib:libfaac$secondaryArchSuffix lib:libfaad$secondaryArchSuffix - lib:libflac$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libfribidi$secondaryArchSuffix lib:libgif$secondaryArchSuffix - lib:libgl$secondaryArchSuffix lib:libgnutls$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -66,40 +65,49 @@ REQUIRES=" lib:libmad$secondaryArchSuffix lib:libmng$secondaryArchSuffix lib:libmp3lame$secondaryArchSuffix - #lib:libmpcdec$secondaryArchSuffix +# lib:libmpcdec$secondaryArchSuffix lib:libmpeg2$secondaryArchSuffix lib:libmpg123$secondaryArchSuffix lib:libncursesw$secondaryArchSuffix lib:libogg$secondaryArchSuffix - lib:libopenal$secondaryArchSuffix - #lib:libopenjp2$secondaryArchSuffix +# lib:libopenal$secondaryArchSuffix +# lib:libopenjp2$secondaryArchSuffix lib:libopus$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - #lib:libschroedinger_1.0$secondaryArchSuffix - #lib:libsdl$secondaryArchSuffix + lib:libpostproc$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix +# lib:libschroedinger_1.0$secondaryArchSuffix +# lib:libsdl$secondaryArchSuffix lib:libsmbclient$secondaryArchSuffix lib:libspeex$secondaryArchSuffix - lib:libtheora$secondaryArchSuffix + lib:libswscale$secondaryArchSuffix + lib:libswresample$secondaryArchSuffix + lib:libtheoradec$secondaryArchSuffix lib:libtwolame$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix - lib:libvpx$secondaryArchSuffix + lib:libvorbisenc$secondaryArchSuffix +# lib:libvpx$secondaryArchSuffix lib:libx264$secondaryArchSuffix lib:libz$secondaryArchSuffix +# lib:live555$secondaryArchSuffix " BUILD_REQUIRES=" - ffmpeg${secondaryArchSuffix}_devel - #devel:live555$secondaryArchSuffix + haiku${secondaryArchSuffix}_devel + devel:libavcodec$secondaryArchSuffix + devel:libavformat$secondaryArchSuffix + devel:libavresample$secondaryArchSuffix + devel:libavutil$secondaryArchSuffix devel:liba52$secondaryArchSuffix devel:libbz2$secondaryArchSuffix devel:libcaca$secondaryArchSuffix - #devel:libcddb$secondaryArchSuffix - devel:libcdio$secondaryArchSuffix + devel:libcddb$secondaryArchSuffix +# devel:libcdio$secondaryArchSuffix devel:libdca$secondaryArchSuffix devel:libdv$secondaryArchSuffix devel:libdvdcss$secondaryArchSuffix devel:libdvdnav$secondaryArchSuffix devel:libdvdread$secondaryArchSuffix + devel:libenca$secondaryArchSuffix devel:libfaac$secondaryArchSuffix devel:libfaad$secondaryArchSuffix devel:libflac$secondaryArchSuffix @@ -107,7 +115,6 @@ BUILD_REQUIRES=" devel:libfreetype$secondaryArchSuffix devel:libfribidi$secondaryArchSuffix devel:libgif$secondaryArchSuffix - devel:libgl$secondaryArchSuffix devel:libgnutls$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix @@ -115,33 +122,38 @@ BUILD_REQUIRES=" devel:libmad$secondaryArchSuffix devel:libmng$secondaryArchSuffix devel:libmp3lame$secondaryArchSuffix - #devel:libmpcdec$secondaryArchSuffix +# devel:libmpcdec$secondaryArchSuffix devel:libmpeg2$secondaryArchSuffix devel:libmpg123$secondaryArchSuffix devel:libncursesw$secondaryArchSuffix devel:libogg$secondaryArchSuffix - devel:libopenal$secondaryArchSuffix - #devel:libopenjp2$secondaryArchSuffix +# devel:libopenal$secondaryArchSuffix +# devel:libopenjp2$secondaryArchSuffix devel:libopus$secondaryArchSuffix devel:libparanoia$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - #devel:libschroedinger_1.0$secondaryArchSuffix - #devel:libsdl$secondaryArchSuffix + devel:libpostproc$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix +# devel:libschroedinger_1.0$secondaryArchSuffix +# devel:libsdl$secondaryArchSuffix devel:libsmbclient$secondaryArchSuffix devel:libspeex$secondaryArchSuffix - devel:libtheora$secondaryArchSuffix + devel:libswscale$secondaryArchSuffix + devel:libswresample$secondaryArchSuffix + devel:libtheoradec$secondaryArchSuffix devel:libtwolame$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix - devel:libvpx$secondaryArchSuffix + devel:libvorbisenc$secondaryArchSuffix +# devel:libvpx$secondaryArchSuffix devel:libx264$secondaryArchSuffix devel:libz$secondaryArchSuffix +# devel:live555$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix +# cmd:xslt_config$secondaryArchSuffix cmd:yasm " @@ -151,12 +163,19 @@ BUILD() export LDFLAGS="-lnetwork -lbsd" libtoolize --force --copy --install - configure --prefix=$prefix --datadir=$dataDir \ - --confdir=$settingsDir/mplayer --mandir=$manDir \ - --enable-dvdread --extra-libs="-ldvdcss -ldvdnav -ldvdread" --enable-menu \ - --enable-haiku --disable-sdl --enable-runtime-cpudetection \ + configure \ + --prefix=$prefix \ + --datadir=$dataDir \ + --confdir=$settingsDir/mplayer \ + --mandir=$manDir \ + --disable-ffmpeg_a \ + --disable-sdl \ + --enable-dvdread --extra-libs="-ldvdcss -ldvdnav -ldvdread" \ + --enable-haiku \ + --enable-menu \ + --enable-runtime-cpudetection \ --enable-smb - #--disable-ffmpeg_a --enable-ffmpeg_so + make $jobArgs }