Date: Sun, 22 Sep 2013 09:16:46 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327856 - in head/devel/sdl20: . files Message-ID: <201309220916.r8M9GkXG098243@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Sun Sep 22 09:16:46 2013 New Revision: 327856 URL: http://svnweb.freebsd.org/changeset/ports/327856 Log: - fix the include directory lists for proper usage in sdl2-config and sdl2.pc Reported by: Vitaly Magerya <vmagerya@gmail.com> Added: head/devel/sdl20/files/ head/devel/sdl20/files/patch-cmake_sdlchecks.cmake (contents, props changed) Modified: head/devel/sdl20/Makefile Modified: head/devel/sdl20/Makefile ============================================================================== --- head/devel/sdl20/Makefile Sun Sep 22 09:12:31 2013 (r327855) +++ head/devel/sdl20/Makefile Sun Sep 22 09:16:46 2013 (r327856) @@ -2,6 +2,7 @@ PORTNAME= sdl2 PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} Added: head/devel/sdl20/files/patch-cmake_sdlchecks.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sdl20/files/patch-cmake_sdlchecks.cmake Sun Sep 22 09:16:46 2013 (r327856) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309220916.r8M9GkXG098243>