diff options
| author | mva <mva@FreeBSD.org> | 2013-09-22 17:16:46 +0800 |
|---|---|---|
| committer | mva <mva@FreeBSD.org> | 2013-09-22 17:16:46 +0800 |
| commit | ed73d0eb82ddcb3212395ee33255024d7460aae8 (patch) | |
| tree | d251a384a4a67ed05b9d1a2f979f1d24b6d9c443 | |
| parent | 8788177c4c0e56e4370d21d8184fb72670c0891c (diff) | |
| download | freebsd-ports-gnome-ed73d0eb82ddcb3212395ee33255024d7460aae8.tar.gz freebsd-ports-gnome-ed73d0eb82ddcb3212395ee33255024d7460aae8.tar.zst freebsd-ports-gnome-ed73d0eb82ddcb3212395ee33255024d7460aae8.zip | |
- fix the include directory lists for proper usage in sdl2-config and
sdl2.pc
Reported by: Vitaly Magerya <vmagerya@gmail.com>
| -rw-r--r-- | devel/sdl20/Makefile | 1 | ||||
| -rw-r--r-- | devel/sdl20/files/patch-cmake_sdlchecks.cmake | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index 7067bc24117f..58218285a78a 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -2,6 +2,7 @@ PORTNAME= sdl2 PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} diff --git a/devel/sdl20/files/patch-cmake_sdlchecks.cmake b/devel/sdl20/files/patch-cmake_sdlchecks.cmake new file mode 100644 index 000000000000..e207adcc8ff5 --- /dev/null +++ b/devel/sdl20/files/patch-cmake_sdlchecks.cmake @@ -0,0 +1,32 @@ +diff -r 6a145dedc972 cmake/sdlchecks.cmake +--- cmake/sdlchecks.cmake Sat Sep 14 11:25:52 2013 -0700 ++++ cmake/sdlchecks.cmake Sun Sep 22 10:16:09 2013 +0200 +@@ -304,6 +304,11 @@ + endif() + endforeach() + ++ find_path(X_INCLUDEDIR X11/Xlib.h) ++ if(X_INCLUDEDIR) ++ set(X_CFLAGS "-I${X_INCLUDEDIR}") ++ endif() ++ + check_include_file(X11/Xcursor/Xcursor.h HAVE_XCURSOR_H) + check_include_file(X11/extensions/Xinerama.h HAVE_XINERAMA_H) + check_include_file(X11/extensions/XInput2.h HAVE_XINPUT_H) +@@ -345,6 +350,7 @@ + endif(HAVE_SHMAT) + if(NOT HAVE_SHMAT) + add_definitions(-DNO_SHARED_MEMORY) ++ set(X_CFLAGS "${X_CFLAGS} -DNO_SHARED_MEMORY") + endif(NOT HAVE_SHMAT) + endif(NOT HAVE_SHMAT) + +@@ -367,6 +373,8 @@ + endif(HAVE_X11_SHARED) + endif(X11_SHARED) + ++ set(SDL_CFLAGS "${SDL_CFLAGS} ${X_CFLAGS}") ++ + set(CMAKE_REQUIRED_LIBRARIES ${X11_LIB} ${X11_LIB}) + check_c_source_compiles(" + #include <X11/Xlib.h> |