From 57c12ab38b5f4320f125b659bcf9c7263452e631 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Tue, 8 Jan 2019 23:10:36 -0600 Subject: [PATCH 1/4] =?UTF-8?q?Correcci=C3=B3n=20de=20problemas=20de=20com?= =?UTF-8?q?pilaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media-video/darwin-streaming-server/Manifest | 18 +++++++------ .../darwin-streaming-server-6.0.3.ebuild | 25 +++++++++++-------- ...darwin-streaming-server-6.0.3-getopt.patch | 14 +++++++++++ .../files/dss-admin.rc | 21 ++++++++++++++++ 4 files changed, 60 insertions(+), 18 deletions(-) create mode 100644 media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-getopt.patch create mode 100644 media-video/darwin-streaming-server/files/dss-admin.rc diff --git a/media-video/darwin-streaming-server/Manifest b/media-video/darwin-streaming-server/Manifest index ea4db88..435c80d 100644 --- a/media-video/darwin-streaming-server/Manifest +++ b/media-video/darwin-streaming-server/Manifest @@ -1,8 +1,10 @@ -AUX darwin-streaming-server-6.0.3-gentoo.patch 13111 SHA256 a6d1ce2bd2104b323146b36ccf993cc704f8b430dc05e050e4c885b7e5d90a1b SHA512 12f6ed25fea87258ecf526eb62499ba3db82a9b287f3fd754767a251b812ed86132bfb9a31e790c97036b10956e8369698b3baedf1b6f24757c1a423a7a5e11a WHIRLPOOL afb27a37b752e9f97019586c75d6bf641b41728602d6b6e71f006e28bb7aafd604c3508ab9c82d52aa0c8d1427b3556bdfebdd36786b3595243e22eba1755646 -AUX darwin-streaming-server-6.0.3-linux.patch 15014 SHA256 13741e14f704d3b0db00100c9213ff0bec104403622905e92f370d846bf8f2ea SHA512 299e330fd39a263ffebb573b9c5c8b264b203ba9cab108d074f34234491f25d84a929c3bfee045655abdb2564ea8201c0abebbdc36d5ee70399b3684a8c23f50 WHIRLPOOL 530594f6bb637adada9ee7e418bfdffc0c29a6861885c1fedc4f4a68e634388e2133794812af5e4a500ffb6e8267f6d2c7a4b2abc1ff7bab7c4967e1f958206a -AUX darwin-streaming-server-6.0.3-ppc64.patch 1841 SHA256 bc014c9ad7c359c2a9701f8953a36b3f30095c211138009462cc54febe4494d9 SHA512 bb1f33fff0f69d8d4d3b6d6ea31d43ad44ff29ddc876225f48e655a284a279b478d3f24fc3b540b1445efb0e3ca86bf9c41e9215b9e1d0b4aab6a69221055d0f WHIRLPOOL d168549a24b1451f42260022bdcde9986d667194c208f228e1b5004d89b835cbf342a61b18389c0f30d869d38793d0165146572f02eab074634f55100e35a5f2 -AUX darwin-streaming-server-6.0.3-x86_64-m32.patch 561 SHA256 91587215f9e5d040003af94a27bd85c553ccd62c4c2c650182ec5beecf35449e SHA512 63509e0330e39689e2a43a3412bb7429c920da166c483cfe0af7f648159d3a2579dfdb701e658063a1acda57a185e375ce1fde63dd5fe38dfaf8f0b1191b9448 WHIRLPOOL 58e901dcb6581818ced069cdc0f6151a48636653013e158607220eb779fc7103762680ad86a596c758cdaf7624665cf49700bbf1794b8d8cc80aa5e44796eb1b -AUX darwin-streaming-server-6.0.3-x86_64.patch 173414 SHA256 e328e21c4b49075d7ac8bdd0d1227f68f3a6812ecd7eeef27064effdf095609e SHA512 1506acdaa97c044e89015a8762ebe4d970a61d39246d396b0ab769b98a5de426d0278eb4d6e5d1c6484fe16f14c64f578737199fee528546ea1ea03215fe6276 WHIRLPOOL 7d415c9cfe1ccac10a00a86e59716b216968cf168685a76278b6e730c95d1efc976f98e6a829127da584457714d0e64c7735a64d8afbde08efb2a68a988bdd57 -AUX dss.rc 598 SHA256 5743205e13a3682f1aebf9c95bb95c74d68fc4b752b7517bd56ddfa6e0f36003 SHA512 91a65b1ecabb14f081e32c591736eb8d1651c1c4b68859c92ad6afa70639d3fdf2153521f1817b13505812cd07e5d11e19a4ddcd9a21fc761259b456276745bf WHIRLPOOL 65b3780e9ba1f5fa2e3a65a500e0f82c7782bc1caed24df41b233ece183ada58eb75f4035a156be601db7a6a342656bb0ca95c156696cab393832b8ce652b514 -DIST DarwinStreamingSrvr6.0.3-Source.tar 32593920 SHA256 7bf75ced3f603f55c6f7601bfecd9f26393ea98be821d24169f2091843706522 SHA512 f507c8e01ca6f81e1d00a85fb137486d026817015178593c2a5de1dde34f809bc48b1348ea661a94ee0913811d23d0c204d28c29af0c1c9d69bd31eeefd9af85 WHIRLPOOL 74872c9582d4b9c54fad4cec1be6cee4b7cf18f3b8cb92d8b027dfee1ec4a48fdfefddfeda4f2fb5b95e1af291a0c87f4743c4753a4361c408f0b4fe858dcc99 -EBUILD darwin-streaming-server-6.0.3.ebuild 4494 SHA256 8654bb6d3c5856f361675663c234bf14eefd26dd2608567038c41c10517a5482 SHA512 88ea5be53b77efe1883263b0223e5d0340dd72dc0d323ef3374ee9e551cf91bf79f67aa1920aaf2bc9bc969b662439142497cd0468be23283e41d5bdf75c9053 WHIRLPOOL c51a8c1108e8aa4fbe0c0f00e615f451c2d7f381a7b8cacc4aca6c4139de79e697eac647f251bb00fc5b52aa83e51037014bbb7a75b2ee6bcfd3d17e83b4c2e5 +AUX darwin-streaming-server-6.0.3-gentoo.patch 13111 BLAKE2B c021858e5fd6bf4e431c7e99362c88f6e22f87fb660550206874aa3c84ca4b337ed64d665eb6653c44b29dcf3c7a7f83a1732f72d2198031d9c434c6fa36115d SHA512 12f6ed25fea87258ecf526eb62499ba3db82a9b287f3fd754767a251b812ed86132bfb9a31e790c97036b10956e8369698b3baedf1b6f24757c1a423a7a5e11a +AUX darwin-streaming-server-6.0.3-getopt.patch 827 BLAKE2B 27d446e1956cc9cf223117ce06a524c3918cb78b3e722ebc41cb46fd732e06c725f3bb6523715a526a9814b8cb4ea1344b5d63b7e92f773b90a265f02c4c1390 SHA512 b4fbfbdec05b431db830e9d619fd74b0d2c11c64b2e7a8a32a167fbc304d5cd709a42debfa8299ef25be7a4e4f8a946d1aab0ea6fa7e2ed688dbc98d48011856 +AUX darwin-streaming-server-6.0.3-linux.patch 15014 BLAKE2B cd6083a22d5ccf319f0ab29324a51d93c0a06b28c99ba3c04bb84193ede4663c456ae3e00a33015d2055588036809a9d0b7dc221e2ff60f577e89ecb6f9286a4 SHA512 299e330fd39a263ffebb573b9c5c8b264b203ba9cab108d074f34234491f25d84a929c3bfee045655abdb2564ea8201c0abebbdc36d5ee70399b3684a8c23f50 +AUX darwin-streaming-server-6.0.3-ppc64.patch 1841 BLAKE2B ca96e2b3506672b58d0507af3afc8ae6a3663876fe15fcd7721c4dd61892a57becc410deac1de5f8c64b6c694b4eb0f03024fef4a74c7f4c177f1571dd42368d SHA512 bb1f33fff0f69d8d4d3b6d6ea31d43ad44ff29ddc876225f48e655a284a279b478d3f24fc3b540b1445efb0e3ca86bf9c41e9215b9e1d0b4aab6a69221055d0f +AUX darwin-streaming-server-6.0.3-x86_64-m32.patch 561 BLAKE2B dba15147d2ef81af44600b81d8a3a73ecf61997e4c3fee3d84a55b59c3fea0fe3dc4b3964e64d4b35a09bfe9d7e5ec42a55fd5487b02e059307ab5009fcf8c3f SHA512 63509e0330e39689e2a43a3412bb7429c920da166c483cfe0af7f648159d3a2579dfdb701e658063a1acda57a185e375ce1fde63dd5fe38dfaf8f0b1191b9448 +AUX darwin-streaming-server-6.0.3-x86_64.patch 173414 BLAKE2B fdd077dedc22359a4a857f40d1b5caf87dba008a2adcbb5bb728d421c48d11ec27871a5dca814cba7a830667de1d9345c2c41faae8f9f0db21e08a219d448b8e SHA512 1506acdaa97c044e89015a8762ebe4d970a61d39246d396b0ab769b98a5de426d0278eb4d6e5d1c6484fe16f14c64f578737199fee528546ea1ea03215fe6276 +AUX dss-admin.rc 477 BLAKE2B 1ac2961456ce021839adbd09297cd0684a1c5851658b6ba954bf4d05bb806b63a1fab8d9e39438cccb0ccb06c671b85c0e93566ae886d02361f9da28c9b5bf00 SHA512 d1c05ba6cb71bd2d43c3295685439aaf985ab3a96820963c50d3113acc1c45ca86dd27cc35b7f42e28615bc52837ade1400050a57872055eeb3844542b707dd9 +AUX dss.rc 598 BLAKE2B a21bd435490a673a6e36ea225144471298167907c0b825192a8fd0f1d2328a74e74cb5cd80b46a6165b219e4feeed2fcbded703f1de9743154f48915501df6be SHA512 91a65b1ecabb14f081e32c591736eb8d1651c1c4b68859c92ad6afa70639d3fdf2153521f1817b13505812cd07e5d11e19a4ddcd9a21fc761259b456276745bf +DIST DarwinStreamingSrvr6.0.3-Source.tar 32593920 BLAKE2B 21d778f41a7e92be88a1c99ee0ade84cd4be8920b1774ec6cabd50e419a596ddd9a20f1c77ccde069485b35000410d2b8a1dd9472bb784c5b0273520fe8d1325 SHA512 f507c8e01ca6f81e1d00a85fb137486d026817015178593c2a5de1dde34f809bc48b1348ea661a94ee0913811d23d0c204d28c29af0c1c9d69bd31eeefd9af85 +EBUILD darwin-streaming-server-6.0.3.ebuild 4613 BLAKE2B f6eb2908cb6885b41ec0efd8e83163812330d63b2b2d87cc0861ad41bc61835b6096b2a5626aa0f1739a765f9a8a51cf2eacac9f47614ecd995d2c8432b5786b SHA512 32a3ff7ef04458c9fc1fe60df825448d6c9da56fb8dec1873c94a56a3a95b3ac2e8189a8dbb3311c68faadb3d057aa5625511e9038fc4fd7887441adf575ce9f diff --git a/media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild b/media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild index e7a462e..bc4648a 100644 --- a/media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild +++ b/media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: darwin-streaming-server-6.0.3.ebuild 2008-06-05 bpkroth $ -EAPI=2 +EAPI=7 inherit eutils @@ -19,47 +19,52 @@ LICENSE="APSL-2" SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="ssl ${M32}" +IUSE=" ssl ${M32}" DEPEND="virtual/libc" RDEPEND="${DEPEND} + m32? ( elibc_glibc? ( sys-libs/glibc[multilib] ) ) dev-lang/perl !media-video/darwin-streaming-server-bin ssl? ( dev-perl/Net-SSLeay )" DEPEND="${DEPEND}" -src_unpack() { - unpack ${A} +src_prepare() { #Apply the patch to set proper FHS paths - cd ${WORKDIR} - epatch ${FILESDIR}/${P}-gentoo.patch + #cd ${WORKDIR} + eapply ${FILESDIR}/${P}-gentoo.patch # A patch to make things build nicely in linux: # http://dss.macosforge.org/trac/ticket/6 - epatch ${FILESDIR}/${P}-linux.patch + eapply ${FILESDIR}/${P}-linux.patch # Apply the patch to allow PPC64 w/ 32bit-UL to build as if it were i686. # http://bugs.gentoo.org/show_bug.cgi?id=84011#c36 # Warning: this is a hack. if [ "${ARCH}" == "ppc" ] || [ ${ARCH} == "ppc64" ]; then - epatch ${FILESDIR}/${P}-ppc64.patch + eapply ${FILESDIR}/${P}-ppc64.patch fi # Apply patch to build on x86_64 # http://dss.macosforge.org/trac/ticket/10 if [ "${ARCH}" == "amd64" ]; then - epatch ${FILESDIR}/${P}-x86_64.patch + eapply ${FILESDIR}/${P}-x86_64.patch if use m32; then - epatch ${FILESDIR}/${P}-x86_64-m32.patch + eapply ${FILESDIR}/${P}-x86_64-m32.patch else ewarn "This package is currently unstable when builing 64-bit code." ewarn "Please consider setting USE=\"m32\" to force 32-bit code." ewarn "See: http://dss.macosforge.org/trac/ticket/10" fi fi + + # Apply more compile fixes + eapply ${FILESDIR}/${P}-getopt.patch + + default } src_compile() { diff --git a/media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-getopt.patch b/media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-getopt.patch new file mode 100644 index 0000000..ecf4d7e --- /dev/null +++ b/media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-getopt.patch @@ -0,0 +1,14 @@ +Binary files DarwinStreamingSrvr6.0.3-Source.patched.orig/CommonUtilitiesLib/.getopt.h.swp and DarwinStreamingSrvr6.0.3-Source.patched/CommonUtilitiesLib/.getopt.h.swp differ +diff -puriN DarwinStreamingSrvr6.0.3-Source.patched.orig/CommonUtilitiesLib/getopt.h DarwinStreamingSrvr6.0.3-Source.patched/CommonUtilitiesLib/getopt.h +--- DarwinStreamingSrvr6.0.3-Source.patched.orig/CommonUtilitiesLib/getopt.h 2019-01-08 22:48:14.000000000 -0600 ++++ DarwinStreamingSrvr6.0.3-Source.patched/CommonUtilitiesLib/getopt.h 2019-01-08 22:52:42.000000000 -0600 +@@ -94,7 +94,8 @@ extern int optreset; + extern int optind; + extern int opterr; + extern int optopt; +-int getopt(int argc, char* const *argv, const char *optstr); ++int getopt(int argc, char* const *argv, const char *optstr) ++ __THROW __nonnull ((2, 3)); + + //#endif /* WIN32 */ + diff --git a/media-video/darwin-streaming-server/files/dss-admin.rc b/media-video/darwin-streaming-server/files/dss-admin.rc new file mode 100644 index 0000000..5250679 --- /dev/null +++ b/media-video/darwin-streaming-server/files/dss-admin.rc @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +depend() { + need net dss + use dns + after dss +} + +start() { + ebegin "Starting Darwin Streaming Server Admin" + start-stop-daemon --quiet --start --exec /usr/bin/streamingadminserver.pl + eend $? +} + +stop() { + ebegin "Stopping Darwin Streaming Server Admin" + start-stop-daemon --quiet --stop --pidfile /var/run/streamingadminserver.pid + eend $? +} From b8279ee339dce701c3fb0ea21764ce146caf1284 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Tue, 8 Jan 2019 23:14:22 -0600 Subject: [PATCH 2/4] limpieza de versiones obsoletas --- app-emulation/wine-vanilla/Manifest | 3 - .../wine-vanilla-2.0.3-r100.ebuild | 523 ------------------ 2 files changed, 526 deletions(-) delete mode 100644 app-emulation/wine-vanilla/Manifest delete mode 100644 app-emulation/wine-vanilla/wine-vanilla-2.0.3-r100.ebuild diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest deleted file mode 100644 index fec792b..0000000 --- a/app-emulation/wine-vanilla/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST gentoo-wine-patches-20170830.tar.xz 58456 SHA256 fb7781d0ae360cbc3860c2d2e81527a1b903da824c01f5d5040e95aaf99a3970 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575 WHIRLPOOL a79be264bab3fcdeee06fef47efd28e6e1125254ac7f82300cb6ba2591ef69cd76b5fed8f778b1849a0659e680e9fc785f0273d55cb2ed95648a74dffa5e22d2 -DIST wine-2.0.3.tar.xz 18864648 SHA256 a811c664f870a3a01449443a93a6fcee41aea2e912e58f72742eb7924962be56 SHA512 e20dbcb3a48ecb3526eba075d4baebab2529dfc50b7a6d5e18294704470f61db386013f457118c270274b911f9643d203110f46558d23e84e6a6c2d78e237dbb WHIRLPOOL 36928e816b6e4dec2173c424042c3e9da83be4a8fb3847bc90606d92858c66d4f1f41d4e1477d797e19d955d21a01710f1c3149f72da7011fae186705529f29c -EBUILD wine-vanilla-2.0.3-r100.ebuild 17120 SHA256 1b555e8f38d1cedb87b0e9e6107f242e0d75d2c8c59cab15a887ba5f6f4b916d SHA512 0c0813e87853dcdb14af09ed7a8d5854628a1a4ad4ee88d267ea15219088cff66229fc0ba1777a7280f1d1307ec82f258ce18ad42d0fc992789f57aee25ac571 WHIRLPOOL 939b28a9f95d4311b37431af64c4a0f1f544386fbc5854b82711614cc3beed340749c71ecc9c9d9406345ed6083dea72a7849f6c47a2bc9b00a521f9687298c7 diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3-r100.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3-r100.ebuild deleted file mode 100644 index e01f12b..0000000 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3-r100.ebuild +++ /dev/null @@ -1,523 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" -PLOCALE_BACKUP="en" - -inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils - -MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git" - EGIT_BRANCH="master" - inherit git-r3 - SRC_URI="" - #KEYWORDS="" -else - MAJOR_V=$(get_version_component_range 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" - KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -fi -S="${WORKDIR}/${MY_P}" - -GWP_V="20170830" -PATCHDIR="${WORKDIR}/gentoo-wine-patches" - -DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" -HOMEPAGE="https://www.winehq.org/" -SRC_URI="${SRC_URI} - https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz -" - -LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) - X? ( truetype ) - elibc_glibc? ( threads ) - osmesa? ( opengl ) - test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124 - -# FIXME: the test suite is unsuitable for us; many tests require net access -# or fail due to Xvfb's opengl limitations. -RESTRICT="test" - -COMMON_DEPEND=" - X? ( - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] - ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) - netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) - nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) - pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) - ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - xml? ( - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !/dev/null 2>&1 - if ! eend $?; then - eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/549768" - eerror - return 1 - fi - fi - # bug #574044 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then - ebegin "Checking for gcc-5-3 stack realignment compiler bug" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 - if ! eend $?; then - eerror "Wine cannot be built with this version of gcc-5.3" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/574044" - eerror - return 1 - fi - fi - fi - - # Ensure compiler support - if use abi_x86_64; then - ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) - if ! eend $?; then - eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" - eerror - eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" - eerror - return 1 - fi - fi -} - -wine_build_environment_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - if use abi_x86_64; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then - eerror "You need gcc-4.4+ to compile 64-bit wine" - die - elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then - eerror "You need clang-3.8+ to compile 64-bit wine" - die - fi - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then - ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" - ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" - ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then - if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then - ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" - ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." - ewarn "See package.env in man 5 portage for more information on how to do this." - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" - fi - fi - - if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then - eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." - eerror "See https://bugs.gentoo.org/487864 for more details." - eerror - return 1 - fi -} - -wine_env_vcs_vars() { - local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" - local pn_live_val="${pn_live_var}" - eval pn_live_val='$'${pn_live_val} - if [[ ! -z ${EGIT_COMMIT} ]]; then - eerror "Commits must now be specified using the environmental variables" - eerror "WINE_COMMIT" - eerror - return 1 - fi -} - -pkg_pretend() { - wine_build_environment_check || die - - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" - eerror - die - fi - fi -} - -pkg_setup() { - wine_build_environment_check || die - wine_env_vcs_vars || die - - WINE_VARIANT="${PN#wine}-${PV}" - WINE_VARIANT="${WINE_VARIANT#-}" - - MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" - MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" - MY_DATADIR="${MY_DATAROOTDIR}" - MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" - MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" - MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" - MY_MANDIR="${MY_DATADIR}/man" -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack - fi - - default - - l10n_find_plocales_changes "${S}/po" "" ".po" -} - -src_prepare() { - - eapply_bin(){ - local patch - for patch in ${PATCHES_BIN[@]}; do - patchbin --nogit < "${patch}" || die - done - } - - local md5="$(md5sum server/protocol.def)" - - default - eapply_bin - eautoreconf - - # Modification of the server protocol requires regenerating the server requests - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - if ! use run-exes; then - sed -i '/^MimeType/d' loader/wine.desktop || die #117785 - fi - - # Edit wine.desktop to work for specific variant - sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die - - # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die - - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS -} - -src_configure() { - wine_compiler_check || die - - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --docdir="${MY_DOCDIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(use_with fontconfig) - $(use_with ssl gnutls) - $(use_enable gecko mshtml) - $(use_with gphoto2 gphoto) - $(use_with gsm) - $(use_with gstreamer) - --without-hal - $(use_with jpeg) - $(use_with ldap) - $(use_enable mono mscoree) - $(use_with mp3 mpg123) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - $(use_with oss) - $(use_with pcap) - $(use_with png) - $(use_with pulseaudio pulse) - $(use_with threads pthread) - $(use_with scanner sane) - $(use_enable test tests) - $(use_with truetype freetype) - $(use_with udev) - $(use_with v4l) - $(use_with X x) - $(use_with xcomposite) - $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) - ) - - local PKG_CONFIG AR RANLIB - # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - # set AR and RANLIB to make QA scripts happy; #483342 - tc-export PKG_CONFIG AR RANLIB - - if use amd64; then - if [[ ${ABI} == amd64 ]]; then - myconf+=( --enable-win64 ) - else - myconf+=( --disable-win64 ) - fi - - # Note: using --with-wine64 results in problems with multilib.eclass - # CC/LD hackery. We're using separate tools instead. - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" - emake depend -} - -multilib_src_test() { - # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" - if [[ ${ABI} == x86 ]]; then - if [[ $(id -u) == 0 ]]; then - ewarn "Skipping tests since they cannot be run under the root user." - ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" - return - fi - - WINEPREFIX="${T}/.wine-${ABI}" \ - Xemake test - fi -} - -multilib_src_install_all() { - local DOCS=( ANNOUNCE AUTHORS README ) - add_locale_docs() { - local locale_doc="documentation/README.$1" - [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) - } - l10n_for_each_locale_do add_locale_docs - - einstalldocs - prune_libtool_files --all - - if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die - fi - - # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } - multilib_foreach_abi rm_wineconsole - fi - - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} - - if use abi_x86_64 && ! use abi_x86_32; then - dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 - dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader - fi - - # Failglob for bin and man loops - local glob_state=$(shopt -p failglob) - shopt -s failglob - - # Make wrappers for binaries for handling multiple variants - # Note: wrappers instead of symlinks because some are shell which use basename - local b - for b in "${D%/}${MY_PREFIX}"/bin/*; do - make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" - done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr ; do - has ${l} ${LINGUAS} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" -} - -pkg_postinst() { - eselect wine register ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die - fi - - eselect wine update --all --if-unset || die - - xdg_desktop_database_update - - if ! use gecko; then - ewarn "Without Wine Gecko, wine prefixes will not have a default" - ewarn "implementation of iexplore. Many older windows applications" - ewarn "rely upon the existence of an iexplore implementation, so" - ewarn "you will likely need to install an external one, like via winetricks" - fi - if ! use mono; then - ewarn "Without Wine Mono, wine prefixes will not have a default" - ewarn "implementation of .NET. Many windows applications rely upon" - ewarn "the existence of a .NET implementation, so you will likely need" - ewarn "to install an external one, like via winetricks" - fi -} - -pkg_prerm() { - eselect wine deregister ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die - fi - - eselect wine update --all --if-unset || die -} - -pkg_postrm() { - xdg_desktop_database_update -} From 602badf980695088fd572d93b87709b1f48742a9 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Tue, 8 Jan 2019 23:14:58 -0600 Subject: [PATCH 3/4] limpieza de versiones obsoletas --- app-emulation/wine-staging/Manifest | 4 - .../wine-staging-2.19-r100.ebuild | 605 ------------------ 2 files changed, 609 deletions(-) delete mode 100644 app-emulation/wine-staging/Manifest delete mode 100644 app-emulation/wine-staging/wine-staging-2.19-r100.ebuild diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest deleted file mode 100644 index b1f1370..0000000 --- a/app-emulation/wine-staging/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST gentoo-wine-patches-20170830.tar.xz 58456 SHA256 fb7781d0ae360cbc3860c2d2e81527a1b903da824c01f5d5040e95aaf99a3970 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575 WHIRLPOOL a79be264bab3fcdeee06fef47efd28e6e1125254ac7f82300cb6ba2591ef69cd76b5fed8f778b1849a0659e680e9fc785f0273d55cb2ed95648a74dffa5e22d2 -DIST wine-2.19.tar.xz 19549464 SHA256 487131e69875ae9c2d042798f954160146e603e449c3c97981f29b42f4a66095 SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae WHIRLPOOL 123aec3a367e67353655d940ba2ffe9386a583afbd0961dd3f446a00b0cf82ad4ed590508e03bf2a4e60b11753f8f430e748e6614f476675423f3bdaf7089288 -DIST wine-staging-2.19.tar.gz 10241240 SHA256 2fdb083a484708362433000f92b54a5d648df190b2ab084647c45f5624063bd2 SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483 WHIRLPOOL 3ed1a5d39d0ec186538e04ca09e4fa2729f356385523177b753e7c7183416f666f336bec7d4b606f29266cd227cf5e72f707c79adf510bc3899adb76ce3df84f -EBUILD wine-staging-2.19-r100.ebuild 19964 SHA256 c05a9658f08a18483c2222f25ad08f97dbaff2dc257e634ab27e89418bef50a7 SHA512 aa7cf564ef8a34732a55646603fe6f309f9d56d8025fe9ad02e2114f4b07cde72982f7d67171ddaa57eafbf3c0fa833d55a6a26d3cb54c4f2d455b77b2b49bd2 WHIRLPOOL 20f3b367cb7e38d8bee3e574c09bd04a32e02d7bee48d341e099f5cf258cb6c7e584d4819b6a0a4c6e382c1f0407925c08d265fa908c3b5b16f539f4e04d4470 diff --git a/app-emulation/wine-staging/wine-staging-2.19-r100.ebuild b/app-emulation/wine-staging/wine-staging-2.19-r100.ebuild deleted file mode 100644 index 625a7d1..0000000 --- a/app-emulation/wine-staging/wine-staging-2.19-r100.ebuild +++ /dev/null @@ -1,605 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" -PLOCALE_BACKUP="en" - -inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils - -MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://source.winehq.org/git/wine.git" - EGIT_BRANCH="master" - inherit git-r3 - SRC_URI="" - #KEYWORDS="" -else - MAJOR_V=$(get_version_component_range 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" - KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -fi -S="${WORKDIR}/${MY_P}" - -STAGING_P="wine-staging-${PV}" -STAGING_DIR="${WORKDIR}/${STAGING_P}" -GWP_V="20170830" -PATCHDIR="${WORKDIR}/gentoo-wine-patches" - -DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset" -HOMEPAGE="https://www.winehq.org/" -SRC_URI="${SRC_URI} - https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz -" - -if [[ ${PV} == "9999" ]] ; then - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" -else - SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" -fi - -LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) - X? ( truetype ) - elibc_glibc? ( threads ) - osmesa? ( opengl ) - pipelight? ( staging ) - s3tc? ( staging ) - test? ( abi_x86_32 ) - themes? ( staging ) - vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124 - -# FIXME: the test suite is unsuitable for us; many tests require net access -# or fail due to Xvfb's opengl limitations. -RESTRICT="test" - -COMMON_DEPEND=" - X? ( - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - ) - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) - cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] - ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) - netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) - nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) - pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) - ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) - themes? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - ) - truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - xml? ( - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !/dev/null 2>&1 - if ! eend $?; then - eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/549768" - eerror - return 1 - fi - fi - # bug #574044 - if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then - ebegin "Checking for gcc-5-3 stack realignment compiler bug" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 - if ! eend $?; then - eerror "Wine cannot be built with this version of gcc-5.3" - eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," - eerror "or use gcc-config to select a different compiler version." - eerror "See https://bugs.gentoo.org/574044" - eerror - return 1 - fi - fi - fi - - # Ensure compiler support - if use abi_x86_64; then - ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" - # Compile in subshell to prevent "Aborted" message - ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) - if ! eend $?; then - eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" - eerror - eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" - eerror - return 1 - fi - fi -} - -wine_build_environment_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - - if use abi_x86_64; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then - eerror "You need gcc-4.4+ to compile 64-bit wine" - die - elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then - eerror "You need clang-3.8+ to compile 64-bit wine" - die - fi - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then - ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" - ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" - ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" - fi - if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then - if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then - ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" - ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." - ewarn "See package.env in man 5 portage for more information on how to do this." - ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" - fi - fi - - if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then - eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." - eerror "See https://bugs.gentoo.org/487864 for more details." - eerror - return 1 - fi -} - -wine_env_vcs_vars() { - local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" - local pn_live_val="${pn_live_var}" - eval pn_live_val='$'${pn_live_val} - if [[ ! -z ${pn_live_val} ]]; then - if use staging; then - eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" - eerror "cannot be used to set the commit. Instead, you may use the" - eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT." - eerror - return 1 - fi - fi - if [[ ! -z ${EGIT_COMMIT} ]]; then - eerror "Commits must now be specified using the environmental variables" - eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT" - eerror - return 1 - fi -} - -pkg_pretend() { - wine_build_environment_check || die - - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" - eerror - die - fi - fi -} - -pkg_setup() { - wine_build_environment_check || die - wine_env_vcs_vars || die - - WINE_VARIANT="${PN#wine}-${PV}" - WINE_VARIANT="${WINE_VARIANT#-}" - - MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" - MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" - MY_DATADIR="${MY_DATAROOTDIR}" - MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" - MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" - MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" - MY_MANDIR="${MY_DATADIR}/man" -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack - if use staging; then - local CURRENT_WINE_COMMIT=${EGIT_VERSION} - - git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}" - git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}" - - local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die - - if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then - einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." - einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." - einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine" - fi - fi - fi - - default - - l10n_find_plocales_changes "${S}/po" "" ".po" -} - -src_prepare() { - - eapply_bin(){ - local patch - for patch in ${PATCHES_BIN[@]}; do - patchbin --nogit < "${patch}" || die - done - } - - local md5="$(md5sum server/protocol.def)" - - if use staging; then - ewarn "Applying the Wine-Staging patchset. Any bug reports to the" - ewarn "Wine bugzilla should explicitly state that staging was used." - - local STAGING_EXCLUDE="" - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 - use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" - - # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches - ebegin "Running Wine-Staging patch installer" - ( - set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE} - cd "${STAGING_DIR}/patches" - source "${STAGING_DIR}/patches/patchinstall.sh" - ) - eend $? || die "Failed to apply Wine-Staging patches" - fi - - default - eapply_bin - eautoreconf - - # Modification of the server protocol requires regenerating the server requests - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - if ! use run-exes; then - sed -i '/^MimeType/d' loader/wine.desktop || die #117785 - fi - - # Edit wine.desktop to work for specific variant - sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die - - # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die - - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS -} - -src_configure() { - wine_compiler_check || die - - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --docdir="${MY_DOCDIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(use_with fontconfig) - $(use_with ssl gnutls) - $(use_enable gecko mshtml) - $(use_with gphoto2 gphoto) - $(use_with gsm) - $(use_with gstreamer) - --without-hal - $(use_with jpeg) - $(use_with ldap) - $(use_enable mono mscoree) - $(use_with mp3 mpg123) - $(use_with netapi) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - $(use_with oss) - $(use_with pcap) - $(use_with png) - $(use_with pulseaudio pulse) - $(use_with threads pthread) - $(use_with scanner sane) - $(use_enable test tests) - $(use_with truetype freetype) - $(use_with udev) - $(use_with v4l) - $(use_with X x) - $(use_with X xfixes) - $(use_with xcomposite) - $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) - ) - - use staging && myconf+=( - --with-xattr - $(use_with themes gtk3) - $(use_with vaapi va) - ) - - local PKG_CONFIG AR RANLIB - # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - # set AR and RANLIB to make QA scripts happy; #483342 - tc-export PKG_CONFIG AR RANLIB - - if use amd64; then - if [[ ${ABI} == amd64 ]]; then - myconf+=( --enable-win64 ) - else - myconf+=( --disable-win64 ) - fi - - # Note: using --with-wine64 results in problems with multilib.eclass - # CC/LD hackery. We're using separate tools instead. - fi - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" - emake depend -} - -multilib_src_test() { - # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" - if [[ ${ABI} == x86 ]]; then - if [[ $(id -u) == 0 ]]; then - ewarn "Skipping tests since they cannot be run under the root user." - ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" - return - fi - - WINEPREFIX="${T}/.wine-${ABI}" \ - Xemake test - fi -} - -multilib_src_install_all() { - local DOCS=( ANNOUNCE AUTHORS README ) - add_locale_docs() { - local locale_doc="documentation/README.$1" - [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) - } - l10n_for_each_locale_do add_locale_docs - - einstalldocs - prune_libtool_files --all - - if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script - rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ - "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die - fi - - # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then - rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die - rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } - multilib_foreach_abi rm_wineconsole - fi - - use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} - - if use abi_x86_64 && ! use abi_x86_32; then - dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 - dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader - fi - - # Failglob for bin and man loops - local glob_state=$(shopt -p failglob) - shopt -s failglob - - # Make wrappers for binaries for handling multiple variants - # Note: wrappers instead of symlinks because some are shell which use basename - local b - for b in "${D%/}${MY_PREFIX}"/bin/*; do - make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" - done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr ; do - has ${l} ${LINGUAS} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" -} - -pkg_postinst() { - eselect wine register ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die - else - if use staging; then - eselect wine register --staging ${P} || die - fi - fi - - eselect wine update --all --if-unset || die - - xdg_desktop_database_update - - if ! use gecko; then - ewarn "Without Wine Gecko, wine prefixes will not have a default" - ewarn "implementation of iexplore. Many older windows applications" - ewarn "rely upon the existence of an iexplore implementation, so" - ewarn "you will likely need to install an external one, like via winetricks" - fi - if ! use mono; then - ewarn "Without Wine Mono, wine prefixes will not have a default" - ewarn "implementation of .NET. Many windows applications rely upon" - ewarn "the existence of a .NET implementation, so you will likely need" - ewarn "to install an external one, like via winetricks" - fi -} - -pkg_prerm() { - eselect wine deregister ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die - else - if use staging; then - eselect wine deregister --staging ${P} || die - fi - fi - - eselect wine update --all --if-unset || die -} - -pkg_postrm() { - xdg_desktop_database_update -} From 8cb706eb23e2b067203716c1eab3f94ae23c6723 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Wed, 16 Jan 2019 23:50:50 -0600 Subject: [PATCH 4/4] added metadata.xml file --- media-video/darwin-streaming-server/Manifest | 3 ++- .../darwin-streaming-server-6.0.3.ebuild | 1 - media-video/darwin-streaming-server/metadata.xml | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 media-video/darwin-streaming-server/metadata.xml diff --git a/media-video/darwin-streaming-server/Manifest b/media-video/darwin-streaming-server/Manifest index 435c80d..745650b 100644 --- a/media-video/darwin-streaming-server/Manifest +++ b/media-video/darwin-streaming-server/Manifest @@ -7,4 +7,5 @@ AUX darwin-streaming-server-6.0.3-x86_64.patch 173414 BLAKE2B fdd077dedc22359a4a AUX dss-admin.rc 477 BLAKE2B 1ac2961456ce021839adbd09297cd0684a1c5851658b6ba954bf4d05bb806b63a1fab8d9e39438cccb0ccb06c671b85c0e93566ae886d02361f9da28c9b5bf00 SHA512 d1c05ba6cb71bd2d43c3295685439aaf985ab3a96820963c50d3113acc1c45ca86dd27cc35b7f42e28615bc52837ade1400050a57872055eeb3844542b707dd9 AUX dss.rc 598 BLAKE2B a21bd435490a673a6e36ea225144471298167907c0b825192a8fd0f1d2328a74e74cb5cd80b46a6165b219e4feeed2fcbded703f1de9743154f48915501df6be SHA512 91a65b1ecabb14f081e32c591736eb8d1651c1c4b68859c92ad6afa70639d3fdf2153521f1817b13505812cd07e5d11e19a4ddcd9a21fc761259b456276745bf DIST DarwinStreamingSrvr6.0.3-Source.tar 32593920 BLAKE2B 21d778f41a7e92be88a1c99ee0ade84cd4be8920b1774ec6cabd50e419a596ddd9a20f1c77ccde069485b35000410d2b8a1dd9472bb784c5b0273520fe8d1325 SHA512 f507c8e01ca6f81e1d00a85fb137486d026817015178593c2a5de1dde34f809bc48b1348ea661a94ee0913811d23d0c204d28c29af0c1c9d69bd31eeefd9af85 -EBUILD darwin-streaming-server-6.0.3.ebuild 4613 BLAKE2B f6eb2908cb6885b41ec0efd8e83163812330d63b2b2d87cc0861ad41bc61835b6096b2a5626aa0f1739a765f9a8a51cf2eacac9f47614ecd995d2c8432b5786b SHA512 32a3ff7ef04458c9fc1fe60df825448d6c9da56fb8dec1873c94a56a3a95b3ac2e8189a8dbb3311c68faadb3d057aa5625511e9038fc4fd7887441adf575ce9f +EBUILD darwin-streaming-server-6.0.3.ebuild 4468 BLAKE2B e8cc145f2bad94f0725c8a7d606a1facb5dc15d1895485977c27f90b639a5383f3d8ebced43b794d31157200e173a21bfb4814172d428037c7d7f1e0dcd471c0 SHA512 1956a870029a62549476226c068619e47bd9754833e3bd8e2759baf96e6fe9eadad01b4ef95773e300a9a70e3ba2626adbb4de4c9a5c29bb7858cec000ff24dd +MISC metadata.xml 500 BLAKE2B 752c844b862e3511e66f6ab52ea5a836905e4b19a766df8720d6a04b08f35859bc832553515014fbb13c9456b6cfca9e285b3cd806ba1bbd076bddfcc872d1a9 SHA512 6c4c40a0c48950c6ebdec4dbe2caf4c36f8e172c02853b7bb314b3dac6d6237efc2ac337d945d242d2f4b985e411224f26137d1a1805b498471a04ba4e2f30d3 diff --git a/media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild b/media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild index bc4648a..5a97730 100644 --- a/media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild +++ b/media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild @@ -9,7 +9,6 @@ inherit eutils MY_P="DarwinStreamingSrvr${PV}-Source" S="${WORKDIR}/${MY_P}" -DESCRIPTION="Darwin Streaming Server allows you to send streaming media across the internet using the industry standard RTP and RTSP protocols." HOMEPAGE="http://dss.macosforge.org/" SRC_URI="http://dss.macosforge.org/downloads/${MY_P}.tar" diff --git a/media-video/darwin-streaming-server/metadata.xml b/media-video/darwin-streaming-server/metadata.xml new file mode 100644 index 0000000..71de076 --- /dev/null +++ b/media-video/darwin-streaming-server/metadata.xml @@ -0,0 +1,14 @@ + + + + + sandino@sandino.net + Sandino Araico Sanchez + + + Darwin Streaming Server allows you to send streaming media across the internet using the industry standard RTP and RTSP protocols. + + + Build with -m32 compiler flag + +