diff options
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/Manifest.gz | bin | 25218 -> 25224 bytes | |||
-rw-r--r-- | media-video/mplayer/Manifest | 6 | ||||
-rw-r--r-- | media-video/mplayer/files/prepare_mplayer.sh | 42 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-1.5_p20230215.ebuild | 631 | ||||
-rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 10 | ||||
-rw-r--r-- | media-video/vamps/Manifest | 3 | ||||
-rw-r--r-- | media-video/vamps/files/vamps-0.99.2-musl.patch | 146 | ||||
-rw-r--r-- | media-video/vamps/vamps-0.99.2-r2.ebuild | 3 |
8 files changed, 818 insertions, 23 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex c6a1fc89f91d..428005e12c6c 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index e8ecd3220945..a88a3a259ab0 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,9 +1,11 @@ AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e42cc3c6a5eed20496691839355c068ccabf6d20d11d62035231aa208341a1ce9affc44b3e30acfde SHA512 12c15efa5cdb99eac92ff808fa56c6137343cca48b73d5875a7a6b08cf36ebeda5022eb3bae0ba567ff9031d2a0f3b5dbe69ee191ae8ecf48b98a779504df66c -AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a +AUX prepare_mplayer.sh 1490 BLAKE2B f322b1165ea0036ce6e4935d0bc8eb35a1e8f31cff0c579743ba35283809ed725a36008b7e4f34f0a397d7083742ac722bf08100a8035d7e2e265c7bdf5cf9ea SHA512 45019f8d5802e8411e55a6cac41b388ccf1ac0d869a30b4d373925291c37f837c59d5b656813029175c6fba342e4145d9e20f2ef2040a8dc2459a33fb265191b DIST MPlayer-1.5.tar.xz 15379972 BLAKE2B 33c09025a9c521e1bc09a50fabb04e89493cbc4117afb3d5769e17b7dd621e44441a8d9f5a3cce2316c781ed701131a966abb02d64976adee9e5f40b7b475e7f SHA512 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d +DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73 EBUILD mplayer-1.5.ebuild 17073 BLAKE2B 2c0f9851af9f297da34cfc1ed9e8aac631d8c370c0a7645dcd856617fcea640b80781c1c1791a2676447f00fb45ba0acfde37628066a6e2dde4eecea120a6bcc SHA512 1c508343584789db2399c189bd74757739c2ad1c4b04ad3f630c7e8d69666a68e56ee4a7ce7d7204315a0e5945a61b5d53fca05e569019ed19fce6f43488d50e -EBUILD mplayer-9999.ebuild 17011 BLAKE2B 7dccd4963657bfbf14fa81f68b7ecdba466509c7949098cc56cd7465e3dcb30262708e8bda48696cd33f93ae97b815dfa19f9223d0cc6177d335804a763c8ef2 SHA512 a3001945b7a7f633e2a6088d1c742c6e2c015f229636f51b4b974d5f52e70c66f0aa85483515808b98bf2c9191be331049ead89aa73709374c5d4ba98a6c0f74 +EBUILD mplayer-1.5_p20230215.ebuild 17329 BLAKE2B b895d53e7e93d619498c7eb939ef52f339666b7c2b86dc80807cd8137a1cd1fe75305632e51445c7d37379358244aaa86de40b098ac01e8adc3129e0038d3c5e SHA512 8959b627e9d523a3bddfa7afd80b9f9e742a360d559f44839b4a56d3d8648962978c4ae4c9d2997f96d4a8b047c206d04d5f2ec2ffc4692e66e6ba251d8d68ae +EBUILD mplayer-9999.ebuild 17326 BLAKE2B 00da50538429b182a08a35d8f12ece7924d92157bbd1475cfd630a3b769f86f73fa85bedb34335301d1d5c654956888f523c2e83885f7b9a3d129423b4ea9524 SHA512 8daecf5658187b0500c53dff68a4c34a604f778a327cb7e8e85cc23b8596392bbc1bdfbe8856571f3e76851d2642a69210916e183a8234930b7e6bcce327b824 MISC metadata.xml 2475 BLAKE2B 5a083ce5b8ed729245ec9eaf544be95f6cbdb9fcb5b80d3a21195557c3aede46d09bd93a0d1acd3830fc796f90dd5f15a17a3d3c69ba2a1a54a0676264dd02de SHA512 f04082ffd63adf9102dd82eb5b4c628fbf912701c7dae69f0b00bbad4e0957355e43369912e9422acc087200de982920c212efb60ba9c26675f74fd5f37fd739 diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh index 57d47425689f..88ae8773cea8 100644 --- a/media-video/mplayer/files/prepare_mplayer.sh +++ b/media-video/mplayer/files/prepare_mplayer.sh @@ -1,25 +1,35 @@ -#!/bin/sh +#!/usr/bin/env bash +. /lib/gentoo/functions.sh || { echo "Failed to source gentoo-functions!" ; exit 1 ; } VERSION=$(date +%Y%m%d) -PACKAGE="mplayer-1.2_pre${VERSION}" -DUMP_FFMPEG="$(dirname $0)/dump_ffmpeg.sh" +PACKAGE="mplayer-1.5_p${VERSION}" +DUMP_FFMPEG="$(realpath $(dirname $0)/dump_ffmpeg.sh)" +ebegin "Fetching mplayer from svn" svn checkout svn://svn.mplayerhq.hu/mplayer/trunk ${PACKAGE} +eend $? -pushd ${PACKAGE} > /dev/null - # ffmpeg is in git now so no svn external anymore - rm -rf ffmpeg - git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg/ - sh "$DUMP_FFMPEG" - STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2) - printf "$STORE_VERSION" > snapshot_version -popd > /dev/null +pushd ${PACKAGE} > /dev/null || { eerror "Moving to ${PACKAGE} dir failed!" ; exit 1 ; } + # ffmpeg is in git now so no svn external anymore + rm -rf ffmpeg + + ebegin "Cloning ffmpeg from git" + git clone https://git.ffmpeg.org/ffmpeg.git + eend $? + + einfo "Extracting version" + # This should be fatal but it hasn't been fatal in the live ebuild + # for years and it needs fixing, so... + bash "${DUMP_FFMPEG}" || ewarn "Dumping ffmpeg failed!" + STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2) + printf "${STORE_VERSION}" > snapshot_version + einfo "Got version ${STORE_VERSION}" +popd > /dev/null || { eerror "Returning to previous dir failed!" ; exit 1 ; } find "${PACKAGE}" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf find "${PACKAGE}" -type d -name '.git' -prune -print0 | xargs -0 rm -rf -tar cJf ${PACKAGE}.tar.xz ${PACKAGE} -rm -rf ${PACKAGE}/ - -echo "Tarball: \"${PACKAGE}.tar.xz\"" +tar --exclude-vcs -cJf ${PACKAGE}.tar.xz ${PACKAGE} || { eerror "Tar creation failed! Error: $?" ; exit 1 ; } +rm -rf ${PACKAGE}/ || { eerror "Removal of ${PACKAGE}? failed! Error: $?" ; exit 1 ; } -echo "** all done **" +einfo "Tarball: \"${PACKAGE}.tar.xz\"" +einfo "** all done **" diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild new file mode 100644 index 000000000000..b74a6e409f8e --- /dev/null +++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild @@ -0,0 +1,631 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs flag-o-matic + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" + ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" + RELEASE_URI="" + + inherit subversion git-r3 +elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" && "${PV%_p*}" == "${PV}" ]]; then + MY_P="MPlayer-${PV}" + S="${WORKDIR}/${MY_P}" + RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz" +else + # If necessary, don't be afraid to make a snapshot. + # http://www.mplayerhq.hu/design7/dload.html says: + # "We recommend to always use the latest SVN to get the all the new + # features and bugfixes, especially if the release date above looks old." + RELEASE_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" +fi + +FONT_URI=" + mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 + mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 + mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 +" + +DESCRIPTION="Media Player for Linux" +HOMEPAGE="http://www.mplayerhq.hu/" +SRC_URI=" + ${RELEASE_URI} + !truetype? ( ${FONT_URI} ) +" + +IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4" +IUSE+=" cpu_flags_x86_mmx cpu_flags_x86_mmxext" +IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1" +IUSE+=" cpu_flags_x86_sse4_2 cpu_flags_x86_xop" +IUSE+=" cpu_flags_x86_3dnow cpu_flags_x86_3dnowext" + +IUSE+=" cpu_flags_ppc_altivec" + +IUSE+=" a52 aalib +alsa aqua bidi bl bluray" +IUSE+=" bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon" +IUSE+=" ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum" +IUSE+=" mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr" +IUSE+=" radio rar rtc rtmp samba selinux +shm sdl speex" +IUSE+=" tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix" +IUSE+=" vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran" + +VIDEO_CARDS="mga" +for x in ${VIDEO_CARDS}; do + IUSE+=" video_cards_${x}" +done + +FONT_RDEPS=" + media-libs/fontconfig + >=media-libs/freetype-2.2.1:2 + virtual/ttf-fonts +" +X_RDEPS=" + x11-libs/libXext + x11-libs/libXxf86vm +" +# - RAR: although -gpl version is nice, it can't do most functions normal rars can +# nemesi? ( net-libs/libnemesi ) +# - mplayer relies on private APIs in giflib that have been removed: +# https://sourceforge.net/p/giflib/bugs/132/ +RDEPEND=" + app-arch/bzip2 + >=media-video/ffmpeg-4.0:=[vdpau?] + sys-libs/ncurses:= + sys-libs/zlib + a52? ( media-libs/a52dec ) + aalib? ( media-libs/aalib ) + alsa? ( media-libs/alsa-lib ) + bidi? ( dev-libs/fribidi ) + bluray? ( >=media-libs/libbluray-0.2.1:= ) + bs2b? ( media-libs/libbs2b ) + cdio? ( + dev-libs/libcdio:= + dev-libs/libcdio-paranoia + ) + cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) + dga? ( x11-libs/libXxf86dga ) + dts? ( media-libs/libdca ) + dv? ( media-libs/libdv ) + dvd? ( >=media-libs/libdvdread-4.1.3:= ) + dvdnav? ( >=media-libs/libdvdnav-4.1.3:= ) + encode? ( + !twolame? ( toolame? ( media-sound/toolame ) ) + twolame? ( media-sound/twolame ) + faac? ( media-libs/faac ) + mp3? ( media-sound/lame ) + x264? ( >=media-libs/x264-0.0.20100423:= ) + xvid? ( media-libs/xvid ) + ) + enca? ( app-i18n/enca ) + faad? ( media-libs/faad2 ) + ggi? ( media-libs/libggi media-libs/libggiwmh ) + gsm? ( media-sound/gsm ) + iconv? ( virtual/libiconv ) + jack? ( virtual/jack ) + jpeg? ( media-libs/libjpeg-turbo:= ) + ladspa? ( media-libs/ladspa-sdk ) + libass? ( >=media-libs/libass-0.9.10:= ) + libcaca? ( media-libs/libcaca ) + libmpeg2? ( media-libs/libmpeg2 ) + lirc? ( app-misc/lirc ) + live? ( media-plugins/live ) + lzo? ( >=dev-libs/lzo-2 ) + mad? ( media-libs/libmad ) + mng? ( media-libs/libmng:= ) + mp3? ( media-sound/mpg123 ) + nas? ( media-libs/nas ) + openal? ( media-libs/openal ) + opengl? ( virtual/opengl ) + png? ( media-libs/libpng:= ) + pnm? ( media-libs/netpbm ) + pulseaudio? ( media-sound/pulseaudio ) + rar? ( + || ( + app-arch/unrar + app-arch/rar + ) + ) + rtmp? ( media-video/rtmpdump ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl ) + speex? ( media-libs/speex ) + theora? ( media-libs/libtheora[encode?] ) + tremor? ( media-libs/tremor ) + truetype? ( ${FONT_RDEPS} ) + vdpau? ( x11-libs/libvdpau ) + vorbis? ( !tremor? ( media-libs/libvorbis ) ) + X? ( ${X_RDEPS} ) + xinerama? ( x11-libs/libXinerama ) + xscreensaver? ( x11-libs/libXScrnSaver ) + xv? ( x11-libs/libXv ) +" +DEPEND=" + ${RDEPEND} + dga? ( x11-base/xorg-proto ) + dvb? ( virtual/linuxtv-dvb-headers ) + X? ( x11-base/xorg-proto ) + xinerama? ( x11-base/xorg-proto ) + xscreensaver? ( x11-base/xorg-proto ) +" +ASM_DEP="dev-lang/yasm" +BDEPEND=" + virtual/pkgconfig + amd64? ( ${ASM_DEP} ) + doc? ( + app-text/docbook-xml-dtd + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + ) + x86? ( ${ASM_DEP} ) +" +RDEPEND+="selinux? ( sec-policy/selinux-mplayer )" + +LICENSE="GPL-2" +SLOT="0" +#if [[ ${PV} != *9999* ]]; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +#fi + +# faac codecs are nonfree +# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio +# dvd navigation requires dvd read support +# ass and freetype font require iconv and ass requires freetype fonts +# unicode transformations are usefull only with iconv +# radio requires oss or alsa backend +REQUIRED_USE=" + dga? ( X ) + dvdnav? ( dvd ) + enca? ( iconv ) + ggi? ( X ) + libass? ( truetype ) + opengl? ( X ) + osdmenu? ( X ) + truetype? ( iconv ) + vdpau? ( X ) + vidix? ( X ) + xinerama? ( X ) + xscreensaver? ( X ) + xv? ( X )" +RESTRICT="faac? ( bindist )" + +pkg_setup() { + if [[ ${PV} == *9999* ]]; then + elog + elog "This is a live ebuild which installs the latest from upstream's" + elog "subversion repository, and is unsupported by Gentoo." + elog "Everything but bugs in the ebuild itself will be ignored." + elog + fi + + if use cpudetection; then + ewarn + ewarn "You've enabled the cpudetection flag. This feature is" + ewarn "included mainly for people who want to use the same" + ewarn "binary on another system with a different CPU architecture." + ewarn "MPlayer will already detect your CPU settings by default at" + ewarn "buildtime; this flag is used for runtime detection." + ewarn "You won't need this turned on if you are only building" + ewarn "mplayer for this system. Also, if your compile fails, try" + ewarn "disabling this use flag." + fi +} + +src_unpack() { + if [[ ${PV} == *9999* ]]; then + subversion_src_unpack + + cd "${WORKDIR}" || die + rm -rf "${WORKDIR}/${P}/ffmpeg/" || die + ( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack ) + else + unpack ${A} + fi + + if [[ ${PV} == *9999* || "${PV%_rc*}" == "${PV}" ]]; then + cd "${S}" || die + cp "${FILESDIR}/dump_ffmpeg.sh" . || die + chmod +x dump_ffmpeg.sh || die + ./dump_ffmpeg.sh + fi + + if ! use truetype; then + unpack font-arial-iso-8859-1.tar.bz2 \ + font-arial-iso-8859-2.tar.bz2 \ + font-arial-cp1250.tar.bz2 + fi +} + +src_prepare() { + default + + local svf=snapshot_version + if [[ ${PV} == *9999* ]]; then + # Set SVN version manually + subversion_wc_info + printf "${ESVN_WC_REVISION}" > ${svf} || die + fi + + if [[ ! -f VERSION ]]; then + [[ -f "${svf}" ]] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" + + local sv=$(<${svf}) + printf "SVN-r${sv} (Gentoo)" > VERSION || die + fi + + # Fix path to bash executable in configure scripts + sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die + + # Use sane default for >=virtual/udev-197 + sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die +} + +src_configure() { + local myconf=() + local uses i + + # Set LINGUAS + [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/da/dk}" + [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968 + + # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable + # compilation in almost every situation. The reason for this is + # because if --enable is used, it will force the build of that option, + # regardless of whether the dependency is available or not. + + ##################### + # Optional features # + ##################### + # Disable svga since we don't want it + # Disable arts since we don't have kde3 + # Always disable internal ass + # Disable opus and ilbc since it only controls support in internal + # ffmpeg which we do not use + myconf+=( + --disable-arts + --disable-ass-internal + --disable-directfb + --disable-kai + --disable-libilbc + --disable-libnut + --disable-libopus + --disable-svga --disable-svgalib_helper + --disable-xvmc + $(use_enable network networking) + $(use_enable joystick) + ) + + uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild + myconf+=( --disable-nemesi ) # nemesi automagic disable + for i in ${uses}; do + use ${i} || myconf+=( --disable-${i} ) + done + use bidi || myconf+=( --disable-fribidi ) + use ipv6 || myconf+=( --disable-inet6 ) + use libass || myconf+=( --disable-ass ) + use rar || myconf+=( --disable-unrarexec ) + use samba || myconf+=( --disable-smb ) + use lirc || myconf+=( --disable-lirc --disable-lircc --disable-apple-ir ) + + # libcdio support: prefer libcdio over cdparanoia + # don't check for cddb w/cdio + if use cdio; then + myconf+=( --disable-cdparanoia ) + else + myconf+=( --disable-libcdio ) + use cdparanoia || myconf+=( --disable-cdparanoia ) + use cddb || myconf+=( --disable-cddb ) + fi + + ################################ + # DVD read, navigation support # + ################################ + # + # dvdread - accessing a DVD + # dvdnav - navigation of menus + use dvd || myconf+=( --disable-dvdread ) + use dvdnav || myconf+=( --disable-dvdnav ) + + ############# + # Subtitles # + ############# + # + # SRT/ASS/SSA (subtitles) requires freetype support + # freetype support requires iconv + # iconv optionally can use unicode + use truetype || myconf+=( --disable-freetype ) + use iconv || myconf+=( --disable-iconv --charset=noconv ) + use iconv && use unicode && myconf+=( --charset=UTF-8 ) + + ##################################### + # DVB / Video4Linux / Radio support # + ##################################### + myconf+=( --disable-tv-bsdbt848 ) + # gone since linux-headers-2.6.38 + myconf+=( --disable-tv-v4l1 ) + if { use dvb || use v4l || use pvr || use radio; }; then + use dvb || myconf+=( --disable-dvb ) + use pvr || myconf+=( --disable-pvr ) + use v4l || myconf+=( --disable-tv-v4l2 ) + if use radio && { use dvb || use v4l; }; then + myconf+=( + --enable-radio + $(use_enable encode radio-capture) + ) + else + myconf+=( + --disable-radio-v4l2 + --disable-radio-bsdbt848 + ) + fi + else + myconf+=( + --disable-tv + --disable-tv-v4l2 + --disable-radio + --disable-radio-v4l2 + --disable-radio-bsdbt848 + --disable-dvb + --disable-v4l2 + --disable-pvr + ) + fi + + ########## + # Codecs # + ########## + myconf+=( --disable-musepack ) # Use internal musepack codecs for SV7 and SV8 support + myconf+=( --disable-libmpeg2-internal ) # always use system media-libs/libmpeg2 + myconf+=( --disable-gif ) # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/ + use dts || myconf+=( --disable-libdca ) + if ! use mp3; then + myconf+=( + --disable-mp3lame + --disable-mpg123 + ) + fi + uses="a52 bs2b dv gsm lzo rtmp vorbis" + for i in ${uses}; do + use ${i} || myconf+=( --disable-lib${i} ) + done + + uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" + for i in ${uses}; do + use ${i} || myconf+=( --disable-${i} ) + done + # Pulls an outdated libopenjpeg, ffmpeg provides better support for it + myconf+=( --disable-libopenjpeg ) + + # Encoding + uses="faac x264 xvid toolame twolame" + if use encode; then + for i in ${uses}; do + use ${i} || myconf+=( --disable-${i} ) + done + else + myconf+=( --disable-mencoder ) + for i in ${uses}; do + myconf+=( --disable-${i} ) + use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled." + done + fi + + ################# + # Binary codecs # + ################# + myconf+=( --disable-qtx --disable-real --disable-win32dll ) + + ################ + # Video Output # + ################ + uses="md5sum sdl yuv4mpeg" + for i in ${uses}; do + use ${i} || myconf+=( --disable-${i} ) + done + use aalib || myconf+=( --disable-aa ) + use fbcon || myconf+=( --disable-fbdev ) + use libcaca || myconf+=( --disable-caca ) + use zoran || myconf+=( --disable-zr ) + + if ! use kernel_linux || ! use video_cards_mga; then + myconf+=( --disable-mga --disable-xmga ) + fi + + myconf+=( + --disable-3dfx + --disable-tdfxvid + --disable-tdfxfb + ) + + # sun card, disable by default, see bug #258729 + myconf+=( --disable-xvr100 ) + + ################ + # Audio Output # + ################ + myconf+=( --disable-esd ) + uses="alsa jack ladspa nas openal" + for i in ${uses}; do + use ${i} || myconf+=( --disable-${i} ) + done + use pulseaudio || myconf+=( --disable-pulse ) + if ! use radio; then + use oss || myconf+=( --disable-ossaudio ) + fi + + #################### + # Advanced Options # + #################### + # Platform specific flags, hardcoded on amd64 (see below) + use cpudetection && myconf+=( --enable-runtime-cpudetection ) + + uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop" + for i in ${uses}; do + myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) ) + done + myconf+=( $(use_enable cpu_flags_x86_sse4_1 sse4) ) + myconf+=( $(use_enable cpu_flags_x86_sse4_2 sse42) ) + + myconf+=( + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable shm) + ) + + use debug && myconf+=( --enable-debug=3 ) + + if use x86 && gcc-specs-pie; then + filter-flags -fPIC -fPIE + append-ldflags -nopie + fi + + ########################### + # X enabled configuration # + ########################### + myconf+=( --disable-gui ) + myconf+=( --disable-vesa ) + uses="ggi vdpau xinerama xv" + for i in ${uses}; do + use ${i} || myconf+=( --disable-${i} ) + done + use dga || myconf+=( --disable-dga1 --disable-dga2 ) + use opengl || myconf+=( --disable-gl ) + use osdmenu && myconf+=( --enable-menu ) + use vidix || myconf+=( --disable-vidix --disable-vidix-pcidb ) + use xscreensaver || myconf+=( --disable-xss ) + use X || myconf+=( --disable-x11 ) + + ############################ + # OSX (aqua) configuration # + ############################ + if use aqua; then + myconf+=( + --enable-macosx-finder + --enable-macosx-bundle + ) + fi + + # Note: --enable-gnutls only makes sense with --enable-ffmpeg_a + edo ./configure \ + --cc="$(tc-getCC)" \ + --host-cc="$(tc-getBUILD_CC)" \ + --prefix="${EPREFIX}/usr" \ + --bindir="${EPREFIX}/usr/bin" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --confdir="${EPREFIX}/etc/mplayer" \ + --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \ + --mandir="${EPREFIX}/usr/share/man" \ + --disable-ffmpeg_a \ + --disable-gnutls \ + "${myconf[@]}" +} + +src_compile() { + default + + # Build only user-requested docs if they're available. + if use doc ; then + # Select available languages from ${LINGUAS} + local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN" + local BUILT_DOCS=() + local i + + for i in ${LINGUAS} ; do + has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=( ${i} ) + done + + if [[ -z ${BUILT_DOCS[@]} ]]; then + emake -j1 html-chunked + else + for i in ${BUILT_DOCS[@]}; do + emake -j1 html-chunked-${i} + done + fi + fi +} + +src_install() { + local i + + emake \ + DESTDIR="${D}" \ + INSTALLSTRIP="" \ + install + + dodoc AUTHORS Changelog Copyright README etc/codecs.conf + + docinto tech/ + dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} + docinto TOOLS/ + dodoc -r TOOLS/* + docinto tech/mirrors/ + dodoc DOCS/tech/mirrors/* + + if use doc; then + docinto html/ + dodoc -r "${S}"/DOCS/HTML/* + fi + + if ! use truetype; then + dodir /usr/share/mplayer/fonts + + # Do this generic, as the mplayer people like to change the structure + # of their zips ... + local i + for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do + cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts" + done + + # Fix the font symlink ... + rm -rf "${ED}/usr/share/mplayer/font" + dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font + fi + + insinto /etc/mplayer + newins "${S}/etc/example.conf" mplayer.conf + cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_ + # Config options can be section specific, global + # options should go in the default section + [default] + _EOF_ + + doins "${S}/etc/input.conf" + if use osdmenu; then + doins "${S}/etc/menu.conf" + fi + + if use truetype; then + cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_ + fontconfig=1 + subfont-osd-scale=4 + subfont-text-scale=3 + _EOF_ + fi + + # bug 256203 + if use rar; then + cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_ + unrarexec=${EPREFIX}/usr/bin/unrar + _EOF_ + fi + + dosym -r /etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf + newbin "${S}/TOOLS/midentify.sh" midentify +} + +pkg_preinst() { + [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \ + rm -rf "${EROOT}/usr/share/mplayer/Skin/default" +} + +pkg_postrm() { + # Cleanup stale symlinks + [[ -L "${EROOT}/usr/share/mplayer/font" && + ! -e "${EROOT}/usr/share/mplayer/font" ]] && \ + rm -f "${EROOT}/usr/share/mplayer/font" + + [[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" && + ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ]] && \ + rm -f "${EROOT}/usr/share/mplayer/subfont.ttf" +} diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index c938cefbf668..31de25e10b42 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,12 +11,16 @@ if [[ ${PV} == *9999* ]]; then RELEASE_URI="" inherit subversion git-r3 -elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" ]]; then +elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" && "${PV%_p*}" == "${PV}" ]]; then MY_P="MPlayer-${PV}" S="${WORKDIR}/${MY_P}" RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz" else - RELEASE_URI="mirror://gentoo/${P}.tar.xz" + # If necessary, don't be afraid to make a snapshot. + # http://www.mplayerhq.hu/design7/dload.html says: + # "We recommend to always use the latest SVN to get the all the new + # features and bugfixes, especially if the release date above looks old." + RELEASE_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" fi FONT_URI=" diff --git a/media-video/vamps/Manifest b/media-video/vamps/Manifest index f3bb6fce1a50..1d0140ea44a6 100644 --- a/media-video/vamps/Manifest +++ b/media-video/vamps/Manifest @@ -1,4 +1,5 @@ +AUX vamps-0.99.2-musl.patch 4004 BLAKE2B 3b1eb3f2d73e099fd8f5ae2b3a0a178fda261fe27679c4102dad6d35b9640626600386777efe2968321ba3b75f160db91764f937d147cf4feca15f9283a6943d SHA512 0a5c67457ca2403344eb497c1a440a25445565dc9bc1fd22d02852381f974c71686e1e08ea302aa4e8cf81cb20464f84dd02880266cff152002055438efebf46 AUX vamps-0.99.2-premature-eof.patch 1247 BLAKE2B bf59784ff369864d8110b7c65215b3cf5d2082e3b2deed4da617a2c554015e024711f29ccd039e059dc8644895e098358e0c0266b1b70e116ceb6b6f6acd9323 SHA512 9f6422a8583cfeaedf1f5fb97ccac44f9631af7498daccd172b85140b21705d2f80d1769fa994478e8353874a2a24ac9d26460adab1078b08465575460bcfb07 DIST vamps-0.99.2.tar.gz 47062 BLAKE2B cb42c5d10617db92b64d1f696f409e4c01521bf5adb3bc0c4aa14266124b987289deaad6b6c0b5cd6738ad6bcdb3ea3af0cfc0658350c017f73de094e00c651c SHA512 27d26a5b63982e3b68b69b6e4f739e93a8eff2ca2e433e07a1350cafe9733f0b6a684e6bc51bce97612bc85fef9d4bf4ea0e781e493b227896de4cce4cd4662b -EBUILD vamps-0.99.2-r2.ebuild 634 BLAKE2B ca6265aaf4b6b3f255a8dd9d3c0da9cd740fd1e594c81a1bfcec92bcb3a341af47c11008c1101b72d5ee60ea21d69e5deeea35d16423b0a6de242e713cb0d62c SHA512 d3c8a164520d0f592de0d06d4fc3c02ce035e08c9e75035cc3580414454d38c83116ab6d5b2604f17b4e85f5e66878d208cb86efd1ba346c36f2ce3d40c23763 +EBUILD vamps-0.99.2-r2.ebuild 665 BLAKE2B 3f6583969f74b496153e6e44649c197893201855a68e7f5c921befa2f36341fb464faba44634495c0e4421209633a33c32b768a4ba01cca395426574dc57684f SHA512 3208eb8bd85b8a1f7f57836182b373dbb8992e28ecfd45aa90f227bb0d78823ee8fd7fe0dc5724dba53497ddf659bc9da48a5dd88185c350d85ee1141c7f995a MISC metadata.xml 299 BLAKE2B 46eb82cd91337f6c6fd9ac3ff50618bc96a7a91ea70cce2c61790f6c7f35e47a8e9b1686c4b757cd7940bf1c24fc7029eda57f979ad8fc2614c1de69d32a5b4c SHA512 1277ad9618f15a992a83d3542f6198fc89362371bd8f30846df143d07dafb2a1ca694ff13d2f3a430e370697dc3863e112fd7d020d92d76a3cd4903e6d3b0e64 diff --git a/media-video/vamps/files/vamps-0.99.2-musl.patch b/media-video/vamps/files/vamps-0.99.2-musl.patch new file mode 100644 index 000000000000..da7fa4b143a4 --- /dev/null +++ b/media-video/vamps/files/vamps-0.99.2-musl.patch @@ -0,0 +1,146 @@ +https://bugs.gentoo.org/832384 +--- a/vamps/requant.c ++++ b/vamps/requant.c +@@ -188,21 +188,21 @@ int old_dc_pred, new_dc_pred; + + // mpeg2 state + // seq header +- static uint horizontal_size_value; +- static uint vertical_size_value; ++ static unsigned int horizontal_size_value; ++ static unsigned int vertical_size_value; + + // pic header +- static uint picture_coding_type; ++ static unsigned int picture_coding_type; + + // pic code ext +- static uint f_code[2][2]; +- static uint intra_dc_precision; +- static uint picture_structure; +- static uint frame_pred_frame_dct; +- static uint concealment_motion_vectors; +- static uint q_scale_type; +- static uint intra_vlc_format; +- static uint alternate_scan; ++ static unsigned int f_code[2][2]; ++ static unsigned int intra_dc_precision; ++ static unsigned int picture_structure; ++ static unsigned int frame_pred_frame_dct; ++ static unsigned int concealment_motion_vectors; ++ static unsigned int q_scale_type; ++ static unsigned int intra_vlc_format; ++ static unsigned int alternate_scan; + + // error + static int validPicHeader; +@@ -211,9 +211,9 @@ int old_dc_pred, new_dc_pred; + static int sliceError; + + // slice or mb +- static uint quantizer_scale; +- static uint new_quantizer_scale; +- static uint last_coded_scale; ++ static unsigned int quantizer_scale; ++ static unsigned int new_quantizer_scale; ++ static unsigned int last_coded_scale; + static int h_offset, v_offset; + static int mb_skip, mb_add; + static int mb_out; +@@ -385,7 +385,7 @@ int old_dc_pred, new_dc_pred; + assert (wbuf >= owbuf); + #endif + +-static MINLINE void putbits(uint val, int n) ++static MINLINE void putbits(unsigned int val, int n) + { + assert(n < 32); + assert(!(val & (0xffffffffU << n))); +@@ -418,7 +418,7 @@ static MINLINE void Refill_bits(void) + SEEKR(1) + } + +-static MINLINE void Flush_Bits(uint n) ++static MINLINE void Flush_Bits(unsigned int n) + { + assert(inbitcnt >= n); + +@@ -430,21 +430,21 @@ static MINLINE void Flush_Bits(uint n) + while (unlikely(inbitcnt < 24)) Refill_bits(); + } + +-static MINLINE uint Show_Bits(uint n) ++static MINLINE unsigned int Show_Bits(unsigned int n) + { + return ((unsigned int)inbitbuf) >> (32 - n); + } + +-static MINLINE uint Get_Bits(uint n) ++static MINLINE unsigned int Get_Bits(unsigned int n) + { +- uint Val = Show_Bits(n); ++ unsigned int Val = Show_Bits(n); + Flush_Bits(n); + return Val; + } + +-static MINLINE uint Copy_Bits(uint n) ++static MINLINE unsigned int Copy_Bits(unsigned int n) + { +- uint Val = Get_Bits(n); ++ unsigned int Val = Get_Bits(n); + putbits(Val, n); + return Val; + } +@@ -1656,13 +1656,13 @@ static MINLINE void slice_non_intra_DCT (int cur_block) + #endif + } + +-static void motion_fr_frame ( uint f_code[2] ) ++static void motion_fr_frame ( unsigned int f_code[2] ) + { + get_motion_delta (f_code[0]); + get_motion_delta (f_code[1]); + } + +-static void motion_fr_field ( uint f_code[2] ) ++static void motion_fr_field ( unsigned int f_code[2] ) + { + COPYBITS (bit_buf, bits, 1); + get_motion_delta (f_code[0]); +@@ -1673,7 +1673,7 @@ static void motion_fr_field ( uint f_code[2] ) + get_motion_delta (f_code[1]); + } + +-static void motion_fr_dmv ( uint f_code[2] ) ++static void motion_fr_dmv ( unsigned int f_code[2] ) + { + get_motion_delta (f_code[0]); + get_dmv (); +@@ -1690,7 +1690,7 @@ static void motion_fr_conceal ( ) + COPYBITS (bit_buf, bits, 1); + } + +-static void motion_fi_field ( uint f_code[2] ) ++static void motion_fi_field ( unsigned int f_code[2] ) + { + COPYBITS (bit_buf, bits, 1); + +@@ -1698,7 +1698,7 @@ static void motion_fi_field ( uint f_code[2] ) + get_motion_delta (f_code[1]); + } + +-static void motion_fi_16x8 ( uint f_code[2] ) ++static void motion_fi_16x8 ( unsigned int f_code[2] ) + { + COPYBITS (bit_buf, bits, 1); + +@@ -1711,7 +1711,7 @@ static void motion_fi_16x8 ( uint f_code[2] ) + get_motion_delta (f_code[1]); + } + +-static void motion_fi_dmv ( uint f_code[2] ) ++static void motion_fi_dmv ( unsigned int f_code[2] ) + { + get_motion_delta (f_code[0]); + get_dmv (); diff --git a/media-video/vamps/vamps-0.99.2-r2.ebuild b/media-video/vamps/vamps-0.99.2-r2.ebuild index ffc3f70d3a13..4a474fcebe4b 100644 --- a/media-video/vamps/vamps-0.99.2-r2.ebuild +++ b/media-video/vamps/vamps-0.99.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,6 +20,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${P}-premature-eof.patch" + "${FILESDIR}/${P}-musl.patch" ) src_compile() { |