diff options
Diffstat (limited to 'app-emulation/vice')
-rw-r--r-- | app-emulation/vice/Manifest | 2 | ||||
-rw-r--r-- | app-emulation/vice/vice-3.5-r1.ebuild (renamed from app-emulation/vice/vice-3.5.ebuild) | 58 |
2 files changed, 29 insertions, 31 deletions
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 3f512704a6cb..48dce6866252 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -2,5 +2,5 @@ AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86 EBUILD vice-3.4_p38553.ebuild 4410 BLAKE2B ea6539484a88baac8d3d98bbff3c4f589c4bac49c76586496b8453e7b1cfa5c402ff5a1e7a029483da5cf07d78006bc35a3557a67a63230bc85a8b12f3f469d6 SHA512 dd7a3ad05ceb453a71667e0628d8d925b03c864d07c90857d283e5737e0105895222f6bf635c28f0274c005c1f03324dfffef57610b9f32c031b76e2782339eb -EBUILD vice-3.5.ebuild 4094 BLAKE2B 466b405315ac250de41388a96b060f9b3a781dfbda835ee071dea7a1565b3b454dfb448cc5ccec5f7d7dba9570ea65c25d7700b1ffb2e486250bd8e2479d0b43 SHA512 b9fce3160d93891730afa5b87a267b9ead102b953ce241a61fd7c235e1894ec27f16c09b606c532dbf4e1e9608281a8f477fb7237c13cd239f88c2c3d184ba93 +EBUILD vice-3.5-r1.ebuild 4079 BLAKE2B d771d1c419cc9e22ebc6e0c6b62ef55c5f52d16facb22c88997cc18ea053420bd3b6dc324a1f7c34a5cc59dec6960db213b083fddfa07348a0d45ada9abdaff2 SHA512 03bc43270e3ccbb5703006920f06854bf03ce06ebe7af33bf7a956355a527a47f671d0216c7e425345a6ede31e2f495247f23c11538f16bd4d69264d73b1ab30 MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283 diff --git a/app-emulation/vice/vice-3.5.ebuild b/app-emulation/vice/vice-3.5-r1.ebuild index 4518b5ff92ff..625f1bce3a1f 100644 --- a/app-emulation/vice/vice-3.5.ebuild +++ b/app-emulation/vice/vice-3.5-r1.ebuild @@ -13,31 +13,33 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE=" - alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless - ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio - sdl zlib" + alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg + lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib" REQUIRED_USE=" || ( gtk headless sdl ) gtk? ( zlib )" RDEPEND=" - sys-libs/readline:0= + sys-libs/readline:= virtual/libintl alsa? ( media-libs/alsa-lib ) ethernet? ( - >=net-libs/libnet-1.1.2.1:1.1 - >=net-libs/libpcap-0.9.8 + net-libs/libnet:1.1 + net-libs/libpcap ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) gif? ( media-libs/giflib:= ) gtk? ( + dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/glew:0= virtual/opengl x11-libs/cairo - x11-libs/gtk+:3 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11 x11-libs/pango ) jpeg? ( virtual/jpeg ) @@ -49,14 +51,14 @@ RDEPEND=" ) parport? ( sys-libs/libieee1284 ) pci? ( sys-apps/pciutils ) - png? ( media-libs/libpng:0= ) + png? ( media-libs/libpng:= ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-image ) - zlib? ( sys-libs/zlib )" + zlib? ( sys-libs/zlib:= )" DEPEND=" ${RDEPEND} x11-base/xorg-proto" @@ -98,14 +100,6 @@ src_configure() { multibuild_foreach_variant run_in_build_dir multibuild_src_configure } -multibuild_enable() { - if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then - echo --enable-${2} - else - echo --disable-${2} - fi -} - multibuild_src_configure() { # Append ".variant" to x* programs if building multiple variants. local xform @@ -113,20 +107,26 @@ multibuild_src_configure() { xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/" fi + vice-multi_enable() { + if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then + echo --enable-${2} + else + echo --disable-${2} + fi + } + local econfargs=( --program-transform-name="${xform}" - $(multibuild_enable gtk desktop-files) - $(multibuild_enable gtk native-gtk3ui) - $(multibuild_enable headless headlessui) - $(multibuild_enable sdl sdlui2) - + $(vice-multi_enable gtk desktop-files) + $(vice-multi_enable gtk native-gtk3ui) + $(vice-multi_enable headless headlessui) + $(vice-multi_enable sdl sdlui2) $(use_enable cpuhistory) $(use_enable debug debug-gtk3ui) $(use_enable debug) $(use_enable doc pdf-docs) $(use_enable ethernet) $(use_enable ffmpeg external-ffmpeg) - $(use_enable ipv6) $(use_enable lame) $(use_enable parport libieee1284) $(use_enable portaudio) @@ -140,18 +140,16 @@ multibuild_src_configure() { $(use_with png) $(use_with pulseaudio pulse) $(use_with zlib) + $(usex alsa --enable-midi $(use_enable oss midi)) + $(usex pci '' ac_cv_header_pci_pci_h=no) --disable-arch --disable-sdlui --disable-shared-ffmpeg --disable-static-ffmpeg + --disable-static-lame --enable-html-docs - - # Some dependencies lack configure options so prevent them becoming - # automagic by using configure cache variables. - $(usex pci '' ac_cv_header_pci_pci_h=no) - - # Ensure we use giflib, not ungif. - ac_cv_lib_ungif_EGifPutLine=no + --enable-ipv6 + ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif ) econf "${econfargs[@]}" |