diff options
| author | Fernando Tarlá Cardoso Lemos | 2014-04-12 18:56:39 +0200 |
|---|---|---|
| committer | Adam Vandenberg | 2014-04-14 19:42:32 -0700 |
| commit | c0be6ff59fe686196077fd9d127a756c4b19942b (patch) | |
| tree | abddc3fcd678d21facd7848926afda651faa689a /Library/Formula | |
| parent | 2dbd23ef6a088b9c9486eadf912eedcc056cf8f7 (diff) | |
| download | homebrew-c0be6ff59fe686196077fd9d127a756c4b19942b.tar.bz2 | |
mess: drop the x11 requirement
It was only being used to get the OpenGL headers. Solved by using
the OpenGL framework.
Closes #28352.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/mess.rb | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/Library/Formula/mess.rb b/Library/Formula/mess.rb index 9590d108a..fcbcce867 100644 --- a/Library/Formula/mess.rb +++ b/Library/Formula/mess.rb @@ -7,12 +7,14 @@ class Mess < Formula head 'svn://dspnet.fr/mame/trunk' - depends_on :x11 depends_on 'sdl' + # Fixes finding OpenGL headers, already patched upstream + # See: http://git.redump.net/mame/commit/?id=e5e4c0de7169d5cce7167e28a66a75f98d2484c4 + patch :DATA unless build.head? + def install ENV['MACOSX_USE_LIBSDL'] = '1' - ENV['INCPATH'] = "-I#{MacOS::X11.include}" ENV['PTR64'] = (MacOS.prefer_64_bit? ? '1' : '0') system "make", "CC=#{ENV.cc}", "LD=#{ENV.cxx}", @@ -25,3 +27,35 @@ class Mess < Formula end end end + +__END__ +diff --git a/src/osd/sdl/osd_opengl.h b/src/osd/sdl/osd_opengl.h +index c7709f7..73ef207 100644 +--- a/src/osd/sdl/osd_opengl.h ++++ b/src/osd/sdl/osd_opengl.h +@@ -45,8 +45,8 @@ + #define APIENTRY + #endif + +- #include "GL/gl.h" +- #include "GL/glext.h" ++ #include <OpenGL/gl.h> ++ #include <OpenGL/glext.h> + + typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum target); + #endif +diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak +index 819f465..9d92061 100644 +--- a/src/osd/sdl/sdl.mak ++++ b/src/osd/sdl/sdl.mak +@@ -478,7 +478,7 @@ else + INCPATH += `sdl-config --cflags | sed 's:/SDL::'` + CCOMFLAGS += -DNO_SDL_GLEXT + # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m +-LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread ++LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -framework OpenGL + DEFS += -DMACOSX_USE_LIBSDL + endif # MACOSX_USE_LIBSDL + +-- +cgit v0.9.2-21-gd62e |