diff options
| -rw-r--r-- | audio/sdl2_mixer/Makefile | 2 | ||||
| -rw-r--r-- | devel/sdl20/Makefile | 212 | ||||
| -rw-r--r-- | devel/sdl20/pkg-plist | 18 | ||||
| -rw-r--r-- | emulators/joytran/Makefile | 2 | ||||
| -rw-r--r-- | emulators/mame/Makefile | 1 | ||||
| -rw-r--r-- | emulators/mess/Makefile | 1 | ||||
| -rw-r--r-- | graphics/sdl2_gfx/Makefile | 1 | ||||
| -rw-r--r-- | graphics/sdl2_image/Makefile | 2 | ||||
| -rw-r--r-- | graphics/sdl2_ttf/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/smpeg2/Makefile | 1 | ||||
| -rw-r--r-- | net/sdl2_net/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/py-kivy/Makefile | 2 |
12 files changed, 88 insertions, 158 deletions
diff --git a/audio/sdl2_mixer/Makefile b/audio/sdl2_mixer/Makefile index 0dc04131eb46..0dfa1563cf44 100644 --- a/audio/sdl2_mixer/Makefile +++ b/audio/sdl2_mixer/Makefile @@ -2,7 +2,7 @@ PORTNAME= sdl2_mixer PORTVERSION= 2.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ DISTNAME= SDL2_mixer-${PORTVERSION} diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index 9a67f17398a4..43d64af415de 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -12,11 +12,25 @@ COMMENT= Cross-platform multimedia development API LICENSE= ZLIB -USES= pathfix cmake:outsource iconv +USES= gmake iconv pathfix pkgconfig +USE_GNOME= ltverhack +USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes -CMAKE_ARGS+= -DVIDEO_OPENGLES:BOOL=OFF -DALTIVEC:BOOL=OFF -DARTS:BOOL=OFF -CMAKE_ENV+= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS+= --disable-video-opengles \ + --disable-altivec \ + --disable-arts \ + --enable-diskaudio \ + --enable-dummyaudio \ + --enable-video-dummy \ + --disable-dbus \ + --disable-input-tslib \ + --disable-rpath + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + OPTIONS_DEFINE= ALSA ASM DLOPEN ESOUND MMX NAS OSS \ PULSEAUDIO PTHREADS SSE SDL_ATOMIC SDL_AUDIO \ @@ -53,192 +67,112 @@ SDL_VIDEO_DESC= Eanble the SDL Video subsystem VIDEO_OPENGL_DESC= OpenGL rendering support VIDEO_X11_DESC= X11 rendering support +ASM_CONFIGURE_ENABLE= assembly +DLOPEN_CONFIGURE_ENABLE= sdl-dlopen +MMX_CONFIGURE_ENABLE= mmx 3dnow +PTHREADS_CONFIGURE_ENABLE= pthreads pthreads-sem +SDL_ATOMIC_CONFIGURE_ENABLE= atomic gcc-atomics +SDL_AUDIO_CONFIGURE_ENABLE= audio +SDL_CPUINFO_CONFIGURE_ENABLE= cpuinfo +SDL_EVENTS_CONFIGURE_ENABLE= events +SDL_FILE_CONFIGURE_ENABLE= filesystem +SDL_HAPTIC_CONFIGURE_ENABLE= haptic +SDL_JOYSTICK_CONFIGURE_ENABLE= joystick +SDL_LOADSO_CONFIGURE_ENABLE= loadso +SDL_POWER_CONFIGURE_ENABLE= power +SDL_RENDER_CONFIGURE_ENABLE= render +SDL_THREADS_CONFIGURE_ENABLE= threads +SDL_TIMERS_CONFIGURE_ENABLE= timers +SDL_VIDEO_CONFIGURE_EANBLE= video +SSE_CONFIGURE_ENABLE= sse sse2 ssemath + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MALSA} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option ALSA requires SDL_AUDIO .endif -CMAKE_ARGS+= -DALSA:BOOL=ON -DALSA_SHARED:BOOL=ON -LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib -.else -CMAKE_ARGS+= -DALSA:BOOL=OFF -.endif - -CMAKE_ARGS+= -DARTS:BOOL=OFF - -.if ${PORT_OPTIONS:MASM} -CMAKE_ARGS+= -DASSEMBLY:BOOL=ON +CONFIGURE_ARGS+= --enable-alsa --enable-alsa-shared +LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib .else -CMAKE_ARGS+= -DASSEMBLY:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MDLOPEN} -CMAKE_ARGS+= -DSDL_DLOPEN:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_DLOPEN:BOOL=OFF +CONFIGURE_ARGS+= --disable-alsa --disable-alsa-shared .endif .if ${PORT_OPTIONS:MESOUND} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option ESOUND requires SDL_AUDIO .endif -CMAKE_ARGS+= -DESD:BOOL=ON -DESD_SHARED:BOOL=ON -USE_GNOME+= esound +CONFIGURE_ARGS+= --enable-esd --enable-esd-shared +USE_GNOME+= esound .else -CMAKE_ARGS+= -DESD:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MMMX} -CMAKE_ARGS+= -DMMX:BOOL=ON -D3DNOW:BOOL=ON -.else -CMAKE_ARGS+= -DMMX:BOOL=OFF -D3DNOW:BOOL=OFF +CONFIGURE_ARGS+= --disable-esd --disable-esd-shared .endif .if ${PORT_OPTIONS:MNAS} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option NAS requires SDL_AUDIO .endif -CMAKE_ARGS+= -DNAS:BOOL=ON -LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas +CONFIGURE_ARGS+= --enable-nas --enable-nas-shared +LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas .else -CMAKE_ARGS+= -DNAS:BOOL=OFF +CONFIGURE_ARGS+= --disable-nas --disable-nas-shared .endif .if ${PORT_OPTIONS:MOSS} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option OSS requires SDL_AUDIO .endif -CMAKE_ARGS+= -DOSS:BOOL=ON +CONFIGURE_ARGS+= --enable-oss .else -CMAKE_ARGS+= -DOSS:BOOL=OFF +CONFIGURE_ARGS+= --disable-oss .endif .if ${PORT_OPTIONS:MPULSEAUDIO} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option PULSEAUDIO requires SDL_AUDIO .endif -CMAKE_ARGS+= -DPULSEAUDIO:BOOL=ON -DPULSEAUDIO_SHARED:BOOL=ON -.else -CMAKE_ARGS+= -DPULSEAUDIO:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MPTHREADS} -CMAKE_ARGS+= -DPTHREADS:BOOL=ON -.else -CMAKE_ARGS+= -DPTHREADS:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_ATOMIC} -CMAKE_ARGS+= -DSDL_ATOMIC:BOOL=ON +CONFIGURE_ARGS+= --enable-pulseaudio --enable-pulseaudio-shared .else -CMAKE_ARGS+= -DSDL_ATOMIC:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_AUDIO} -CMAKE_ARGS+= -DSDL_AUDIO:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_AUDIO:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_CPUINFO} -CMAKE_ARGS+= -DSDL_CPUINFO:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_CPUINFO:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_EVENTS} -CMAKE_ARGS+= -DSDL_EVENTS:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_EVENTS:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_FILE} -CMAKE_ARGS+= -DSDL_FILE:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_FILE:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_HAPTIC} -CMAKE_ARGS+= -DSDL_HAPTIC:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_HAPTIC:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_JOYSTICK} -CMAKE_ARGS+= -DSDL_JOYSTICK:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_JOYSTICK:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_LOADSO} -CMAKE_ARGS+= -DSDL_LOADSO:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_LOADSO:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_POWER} -CMAKE_ARGS+= -DSDL_POWER:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_POWER:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_RENDER} -CMAKE_ARGS+= -DSDL_RENDER:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_RENDER:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_THREADS} -CMAKE_ARGS+= -DSDL_THREADS:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_THREADS:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_TIMERS} -CMAKE_ARGS+= -DSDL_TIMERS:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_TIMERS:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSDL_VIDEO} -CMAKE_ARGS+= -DSDL_VIDEO:BOOL=ON -.else -CMAKE_ARGS+= -DSDL_VIDEO:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSSE} -CMAKE_ARGS+= -DSSE:BOOL=ON -DSSE2:BOOL=ON -DSSEMATH:BOOL=ON -.else -CMAKE_ARGS+= -DSSE:BOOL=OFF -DSSE2:BOOL=OFF -DSSEMATH:BOOL=OFF +CONFIGURE_ARGS+= --disable-pulseaudio --disable-pulseaudio-shared .endif .if ${PORT_OPTIONS:MVIDEO_OPENGL} .if !${PORT_OPTIONS:MSDL_VIDEO} IGNORE= option VIDEO_OPENGL requires SDL_VIDEO .endif -CMAKE_ARGS+= -DVIDEO_OPENGL:BOOL=ON -USE_GL= gl +CONFIGURE_ARGS+= --enable-video-opengl +USE_GL= gl .else -CMAKE_ARGS+= -DVIDEO_OPENGL:BOOL=OFF +CONFIGURE_ARGS+= --disable-video-opengl .endif .if ${PORT_OPTIONS:MVIDEO_X11} .if !${PORT_OPTIONS:MSDL_VIDEO} IGNORE= option VIDEO_X11 requires SDL_VIDEO .endif -CMAKE_ARGS+= -DVIDEO_X11:BOOL=ON -DVIDEO_X11_XCURSOR:BOOL=ON \ - -DVIDEO_X11_XINERAMA:BOOL=ON -DVIDEO_X11_XINPUT:BOOL=ON \ - -DVIDEO_X11_XRANDR:BOOL=ON -DVIDEO_X11_XSCRNSAVER:BOOL=ON \ - -DVIDEO_X11_XSHAPE:BOOL=ON -DVIDEO_X11_XVM:BOOL=ON \ - -DX11_SHARED:BOOL=ON +CONFIGURE_ARGS+= --enable-video-x11 \ + --enable-x11-shared \ + --enable-video-x11-xcursor \ + --enable-video-x11-xinerama \ + --enable-video-x11-xinput \ + --enable-video-x11-xrandr \ + --enable-video-x11-scrnsaver \ + --enable-video-x11-xshape \ + --enable-video-x11-vm USE_XORG+= xinerama xcursor xi xrandr xscrnsaver xxf86vm xext .else -CMAKE_ARGS+= -DVIDEO_X11:BOOL=OFF -DVIDEO_X11_XCURSOR:BOOL=OFF \ - -DVIDEO_X11_XINERAMA:BOOL=OFF -DVIDEO_X11_XINPUT:BOOL=OFF \ - -DVIDEO_X11_XRANDR:BOOL=OFF -DVIDEO_X11_XSCRNSAVER:BOOL=OFF \ - -DVIDEO_X11_XSHAPE:BOOL=OFF -DVIDEO_X11_XVM:BOOL=OFF \ - -DX11_SHARED:BOOL=OFF +CONFIGURE_ARGS+= --disable-video-x11 \ + --disable-x11-shared \ + --disable-video-x11-xcursor \ + --disable-video-x11-xinerama \ + --disable-video-x11-xinput \ + --disable-video-x11-xrandr \ + --disable-video-x11-scrnsaver \ + --disable-video-x11-xshape \ + --disable-video-x11-vm .endif +post-patch: + @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/devel/sdl20/pkg-plist b/devel/sdl20/pkg-plist index fdf6257277ec..2758a6249725 100644 --- a/devel/sdl20/pkg-plist +++ b/devel/sdl20/pkg-plist @@ -7,15 +7,6 @@ include/SDL2/SDL_bits.h include/SDL2/SDL_blendmode.h include/SDL2/SDL_clipboard.h include/SDL2/SDL_config.h -include/SDL2/SDL_config_android.h -include/SDL2/SDL_config_iphoneos.h -include/SDL2/SDL_config_macosx.h -include/SDL2/SDL_config_minimal.h -include/SDL2/SDL_config_pandora.h -include/SDL2/SDL_config_psp.h -include/SDL2/SDL_config_windows.h -include/SDL2/SDL_config_wiz.h -include/SDL2/SDL_copying.h include/SDL2/SDL_cpuinfo.h include/SDL2/SDL_endian.h include/SDL2/SDL_error.h @@ -72,12 +63,13 @@ include/SDL2/SDL_version.h include/SDL2/SDL_video.h include/SDL2/begin_code.h include/SDL2/close_code.h -share/aclocal/sdl2.m4 +lib/libSDL2-2.0.so +lib/libSDL2-2.0.so.0 lib/libSDL2.a +lib/libSDL2.la lib/libSDL2.so -lib/libSDL2-2.0.so -lib/libSDL2-2.0.so.1 -lib/libSDL2-2.0.so.1.0.1 +lib/libSDL2_test.a lib/libSDL2main.a libdata/pkgconfig/sdl2.pc +share/aclocal/sdl2.m4 @dirrm include/SDL2 diff --git a/emulators/joytran/Makefile b/emulators/joytran/Makefile index 9e0f71c399d2..4cef53924b9e 100644 --- a/emulators/joytran/Makefile +++ b/emulators/joytran/Makefile @@ -3,7 +3,7 @@ PORTNAME= joytran PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= BERLIOS GOOGLE_CODE MASTER_SITE_SUBDIR= joytran diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 97e16b19c14d..2a850dcaddd8 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -3,6 +3,7 @@ PORTNAME= mame PORTVERSION= 0.150${PATCHSUFFIX} +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \ http://mame.mirrors.zippykid.com/releases/ \ diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile index 1975b0967819..32defec5fcda 100644 --- a/emulators/mess/Makefile +++ b/emulators/mess/Makefile @@ -3,6 +3,7 @@ PORTNAME= mess PORTVERSION= 0.150${PATCHSUFFIX} +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= SF/mame.mirror/MAME%20${PORTVERSION} \ http://mame.mirrors.zippykid.com/releases/ \ diff --git a/graphics/sdl2_gfx/Makefile b/graphics/sdl2_gfx/Makefile index 0001a950662a..fc751d07cf11 100644 --- a/graphics/sdl2_gfx/Makefile +++ b/graphics/sdl2_gfx/Makefile @@ -3,6 +3,7 @@ PORTNAME= sdl2_gfx PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.ferzkopp.net/Software/%SUBDIR%/ MASTER_SITE_SUBDIR= SDL2_gfx diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile index 9b4d957d4aa7..581eee491baf 100644 --- a/graphics/sdl2_image/Makefile +++ b/graphics/sdl2_image/Makefile @@ -2,7 +2,7 @@ PORTNAME= sdl2_image PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ DISTNAME= SDL2_image-${PORTVERSION} diff --git a/graphics/sdl2_ttf/Makefile b/graphics/sdl2_ttf/Makefile index b5e544e3a3e6..34e227508db6 100644 --- a/graphics/sdl2_ttf/Makefile +++ b/graphics/sdl2_ttf/Makefile @@ -2,7 +2,7 @@ PORTNAME= sdl2_ttf PORTVERSION= 2.0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/ DISTNAME= SDL2_ttf-${PORTVERSION} diff --git a/multimedia/smpeg2/Makefile b/multimedia/smpeg2/Makefile index 08b1cc53d756..a1a953735671 100644 --- a/multimedia/smpeg2/Makefile +++ b/multimedia/smpeg2/Makefile @@ -3,6 +3,7 @@ PORTNAME= smpeg2 PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.libsdl.org/projects/smpeg/release/ \ http://rsync.macports.org/smpeg2/ diff --git a/net/sdl2_net/Makefile b/net/sdl2_net/Makefile index d19717eb8ea1..a0e4c83f094c 100644 --- a/net/sdl2_net/Makefile +++ b/net/sdl2_net/Makefile @@ -2,7 +2,7 @@ PORTNAME= sdl2_net PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.libsdl.org/projects/SDL_net/release/ DISTNAME= SDL2_net-${PORTVERSION} diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile index bd9c0ff3f948..aa2ff1aed947 100644 --- a/x11-toolkits/py-kivy/Makefile +++ b/x11-toolkits/py-kivy/Makefile @@ -3,7 +3,7 @@ PORTNAME= kivy PORTVERSION= 1.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits python MASTER_SITES= LOCAL/dbn/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} |