diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index 98dce5be0875..c9ec08bae578 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -188,6 +188,7 @@ _linux_rl9_qtwebsockets= linux-rl9-qt5-qtwebsockets>0:www/linux-rl9-qt5-qtwebso _linux_rl9_qtx11extras= linux-rl9-qt5-qtx11extras>0:x11/linux-rl9-qt5-qtx11extras _linux_rl9_qtxmlpatterns= linux-rl9-qt5-qtxmlpatterns>0:textproc/linux-rl9-qt5-qtxmlpatterns _linux_${linux_ARGS}_sdl12= linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12 +_linux_${linux_ARGS}_sdl12-extralibs= linux-${linux_ARGS}-sdl12-extralibs>0:misc/linux-${linux_ARGS}-sdl12-extralibs _linux_${linux_ARGS}_sdl20= linux-${linux_ARGS}-sdl20>0:devel/linux-${linux_ARGS}-sdl20 _linux_${linux_ARGS}_sdl2gfx= linux-${linux_ARGS}-sdl2_gfx>0:graphics/linux-${linux_ARGS}-sdl2_gfx _linux_${linux_ARGS}_sdl2image= linux-${linux_ARGS}-sdl2_image>0:graphics/linux-${linux_ARGS}-sdl2_image diff --git a/emulators/linux-c7/Makefile b/emulators/linux-c7/Makefile index a1e1d2d695ef..b8a19dec35ef 100644 --- a/emulators/linux-c7/Makefile +++ b/emulators/linux-c7/Makefile @@ -1,6 +1,6 @@ PORTNAME= linux-c7 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators linux MAINTAINER= emulation@FreeBSD.org @@ -66,11 +66,9 @@ USES= linux:c7 metaport .include .if ${ARCH} == amd64 -RUN_DEPENDS+= linux-c7-sdl_image>0:graphics/linux-c7-sdl_image \ - linux-c7-openal-soft>0:audio/linux-c7-openal-soft \ +RUN_DEPENDS+= linux-c7-openal-soft>0:audio/linux-c7-openal-soft \ + linux-c7-sdl12-extralibs>0:misc/linux-c7-sdl12-extralibs \ linux-c7-sdl20>0:devel/linux-c7-sdl20 \ - linux-c7-sdl_mixer>0:audio/linux-c7-sdl_mixer \ - linux-c7-sdl_ttf>0:graphics/linux-c7-sdl_ttf \ linux-c7-qtwebkit>0:www/linux-c7-qtwebkit .endif diff --git a/emulators/linux-rl9/Makefile b/emulators/linux-rl9/Makefile index 19a1e8ea2d62..98d63313060e 100644 --- a/emulators/linux-rl9/Makefile +++ b/emulators/linux-rl9/Makefile @@ -1,6 +1,6 @@ PORTNAME= linux-rl9 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators linux MAINTAINER= emulation@FreeBSD.org @@ -27,7 +27,7 @@ USE_LINUX= alsalib alsa-lib-devel alsa-plugins-oss alsa-plugins-pulseaudio \ qt3d qtbase qtconnectivity qtdeclarative qtgraphicaleffects qtimageformats \ qtmultimedia qtquickcontrols qtscript qtsensors qtserialbus qtserialport \ qtsvg qttools qtwayland qtwebchannel qtwebsockets qtx11extras qtxmlpatterns \ - sdl12 sdl20 sdlgfx sdlimage sdlttf sdlsound sdl2gfx sdl2image sdl2mixer sdl2ttf \ + sdl12 sdl12-extralibs sdl20 sdl2gfx sdl2image sdl2mixer sdl2ttf \ sqlite3 strace systemd-libs tcp_wrappers-libs vulkan \ wayland wget xcb-util xorglibs diff --git a/games/linux-dwarffortress/Makefile b/games/linux-dwarffortress/Makefile index 55c6b6d97a99..8c31982aefd2 100644 --- a/games/linux-dwarffortress/Makefile +++ b/games/linux-dwarffortress/Makefile @@ -26,7 +26,7 @@ LICENSE_TEXT= Copyright (c) 2002-2016. All rights are retained by Tarn Adams, \ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept USES= linux tar:bzip2 -USE_LINUX= dri gtk2 libsndfile openal-soft sdlimage sdlttf xorglibs +USE_LINUX= dri gtk2 libsndfile openal-soft sdl12-extralibs xorglibs SUB_FILES= dwarffortress NO_BUILD= yes diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile index 63f6055591e9..27494cf48e09 100644 --- a/games/linux-nwnclient/Makefile +++ b/games/linux-nwnclient/Makefile @@ -47,7 +47,7 @@ NWMOVIESFILE= nwmovies-v4-public.20090223.080954.tar.gz BINKPLAYERFILE= BinkLinuxPlayer.7z CLIENT_NWMOVIES=${NWMOVIESFILE}:NWMOVIES \ ${BINKPLAYERFILE}:BINK -USE_LINUX+= sdlmixer +USE_LINUX+= sdl12-extralibs PLIST_SUB+= NWMOVIES="" .else PLIST_SUB+= NWMOVIES="@comment " diff --git a/japanese/slimeforest/Makefile b/japanese/slimeforest/Makefile index fda3bdbde3cc..fd8d7ff38bad 100644 --- a/japanese/slimeforest/Makefile +++ b/japanese/slimeforest/Makefile @@ -21,7 +21,7 @@ PLIST_SUB= BINMODE=${BINMODE} SUB_FILES= ${PORTNAME}.sh USES= linux -USE_LINUX= sdlimage +USE_LINUX= sdl12-extralibs WRKSRC= ${WRKDIR}/slimeforest