Forgot to remove these, all of this stuff was committed upstream.
This commit is contained in:
bcallah
parent
a6432af694
commit
d5d488aa3d
@ -1,45 +0,0 @@
|
||||
# - Try to find ogg
|
||||
# Once done this will define
|
||||
#
|
||||
# OGG_FOUND - system has ogg
|
||||
# OGG_INCLUDE_DIR
|
||||
# OGG_LIBRARY
|
||||
#
|
||||
# $OGGDIR is an environment variable used
|
||||
# for finding ogg.
|
||||
#
|
||||
# Several changes and additions by Fabian 'x3n' Landau
|
||||
# Most of all rewritten by Adrian Friedli
|
||||
# Debug versions and simplifications by Reto Grieder
|
||||
# > www.orxonox.net <
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
|
||||
FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h
|
||||
PATHS $ENV{OGGDIR}
|
||||
PATH_SUFFIXES include
|
||||
)
|
||||
IF (WIN32)
|
||||
FIND_LIBRARY(OGG_LIBRARY
|
||||
NAMES libogg libogg-static-mt
|
||||
PATHS $ENV{OGGDIR}
|
||||
PATH_SUFFIXES Release
|
||||
)
|
||||
ELSE()
|
||||
FIND_LIBRARY(OGG_LIBRARY
|
||||
NAMES ogg
|
||||
PATH_SUFFIXES lib
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
|
||||
# Handle the REQUIRED argument and set OGG_FOUND
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ogg DEFAULT_MSG
|
||||
OGG_LIBRARY
|
||||
OGG_INCLUDE_DIR
|
||||
)
|
||||
|
||||
MARK_AS_ADVANCED(
|
||||
OGG_INCLUDE_DIR
|
||||
OGG_LIBRARY
|
||||
)
|
||||
@ -1,52 +0,0 @@
|
||||
# - Try to find ogg/vorbis
|
||||
# Once done this will define
|
||||
#
|
||||
# VORBIS_FOUND - system has vorbis
|
||||
# VORBIS_INCLUDE_DIR
|
||||
# VORBIS_LIBRARIES - vorbis and vorbisfile libraries
|
||||
#
|
||||
# $VORBISDIR is an environment variable used
|
||||
# for finding vorbis.
|
||||
#
|
||||
# Several changes and additions by Fabian 'x3n' Landau
|
||||
# Most of all rewritten by Adrian Friedli
|
||||
# Debug versions and simplifications by Reto Grieder
|
||||
# > www.orxonox.net <
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
|
||||
FIND_PATH(VORBIS_INCLUDE_DIR vorbis/codec.h
|
||||
PATHS $ENV{VORBISDIR}
|
||||
PATH_SUFFIXES include
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
FIND_LIBRARY(VORBIS_LIBRARIES
|
||||
NAMES libvorbis libvorbis-static-mt
|
||||
PATHS $ENV{VORBISDIR}
|
||||
PATH_SUFFIXES Release
|
||||
)
|
||||
ELSE()
|
||||
FIND_LIBRARY(VORBIS_LIBRARIES
|
||||
NAMES vorbis
|
||||
PATH_SUFFIXES lib
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
# Handle the REQUIRED argument and set VORBIS_FOUND
|
||||
IF(NOT WIN32)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Vorbis DEFAULT_MSG
|
||||
VORBIS_LIBRARIES
|
||||
VORBIS_INCLUDE_DIR
|
||||
)
|
||||
ELSE()
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Vorbis DEFAULT_MSG
|
||||
VORBIS_LIBRARIES
|
||||
VORBIS_INCLUDE_DIR
|
||||
)
|
||||
ENDIF(NOT WIN32)
|
||||
|
||||
MARK_AS_ADVANCED(
|
||||
VORBIS_INCLUDE_DIR
|
||||
VORBIS_LIBRARIES
|
||||
)
|
||||
@ -1,80 +0,0 @@
|
||||
$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2013/03/13 15:49:53 bcallah Exp $
|
||||
--- src/CMakeLists.txt.orig Thu Jan 31 20:05:26 2013
|
||||
+++ src/CMakeLists.txt Sat Mar 9 11:29:53 2013
|
||||
@@ -37,8 +37,8 @@ SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\
|
||||
SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"")
|
||||
SET(FLAGS "${FLAGS} -DPKG_NAME=\\\"${PKG_NAME}/\\\"")
|
||||
|
||||
-IF (DEBUG_MENU)
|
||||
- SET(FLAGS "${FLAGS} -DDEBUG_MENU")
|
||||
+IF (DEBUG_FEATURES)
|
||||
+ SET(FLAGS "${FLAGS} -DDEBUG_FEATURES")
|
||||
ENDIF()
|
||||
|
||||
IF (CMAKE_BUILD_TYPE)
|
||||
@@ -61,6 +61,10 @@ IF (WIN32)
|
||||
FIND_PACKAGE(LibIntl REQUIRED)
|
||||
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR BEOS OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
FIND_PACKAGE(LibIntl REQUIRED)
|
||||
+ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
|
||||
+ FIND_PACKAGE(LibIntl REQUIRED)
|
||||
+ FIND_PACKAGE(Ogg REQUIRED)
|
||||
+ FIND_PACKAGE(Vorbis REQUIRED)
|
||||
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL SunOS)
|
||||
# explicit linking to libintl is required on Solaris
|
||||
SET(EXTRA_LIBRARIES intl)
|
||||
@@ -466,20 +470,40 @@ ELSE()
|
||||
ADD_EXECUTABLE(valyriatear WIN32 ${SRCS} ${SRCS_COMMON} ${SRCS_LUABIND})
|
||||
ENDIF()
|
||||
|
||||
-TARGET_LINK_LIBRARIES(valyriatear
|
||||
- ${INTERNAL_LIBRARIES}
|
||||
- ${SDL_LIBRARY}
|
||||
- ${SDLTTF_LIBRARY}
|
||||
- ${SDLIMAGE_LIBRARY}
|
||||
- ${OPENGL_LIBRARIES}
|
||||
- ${OPENAL_LIBRARY}
|
||||
- ${VORBISFILE_LIBRARIES}
|
||||
- ${PNG_LIBRARIES}
|
||||
- ${JPEG_LIBRARIES}
|
||||
- ${LUA_LIBRARIES}
|
||||
- ${X11_LIBRARIES}
|
||||
- ${LIBINTL_LIBRARIES}
|
||||
- ${EXTRA_LIBRARIES})
|
||||
+# Vorbis, vorbisfile and ogg are explcitely needed on OpenBSD
|
||||
+IF (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
|
||||
+ TARGET_LINK_LIBRARIES(valyriatear
|
||||
+ ${INTERNAL_LIBRARIES}
|
||||
+ ${SDL_LIBRARY}
|
||||
+ ${SDLTTF_LIBRARY}
|
||||
+ ${SDLIMAGE_LIBRARY}
|
||||
+ ${OPENGL_LIBRARIES}
|
||||
+ ${OPENAL_LIBRARY}
|
||||
+ ${VORBISFILE_LIBRARIES}
|
||||
+ ${OGG_LIBRARY}
|
||||
+ ${VORBIS_LIBRARIES}
|
||||
+ ${PNG_LIBRARIES}
|
||||
+ ${JPEG_LIBRARIES}
|
||||
+ ${LUA_LIBRARIES}
|
||||
+ ${X11_LIBRARIES}
|
||||
+ ${LIBINTL_LIBRARIES}
|
||||
+ ${EXTRA_LIBRARIES})
|
||||
+ELSE()
|
||||
+ TARGET_LINK_LIBRARIES(valyriatear
|
||||
+ ${INTERNAL_LIBRARIES}
|
||||
+ ${SDL_LIBRARY}
|
||||
+ ${SDLTTF_LIBRARY}
|
||||
+ ${SDLIMAGE_LIBRARY}
|
||||
+ ${OPENGL_LIBRARIES}
|
||||
+ ${OPENAL_LIBRARY}
|
||||
+ ${VORBISFILE_LIBRARIES}
|
||||
+ ${PNG_LIBRARIES}
|
||||
+ ${JPEG_LIBRARIES}
|
||||
+ ${LUA_LIBRARIES}
|
||||
+ ${X11_LIBRARIES}
|
||||
+ ${LIBINTL_LIBRARIES}
|
||||
+ ${EXTRA_LIBRARIES})
|
||||
+ENDIF()
|
||||
|
||||
INSTALL(TARGETS valyriatear RUNTIME DESTINATION ${PKG_BINDIR})
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-src_engine_video_image_cpp,v 1.1 2013/06/07 20:03:31 naddy Exp $
|
||||
|
||||
Fix build with png-1.6.
|
||||
|
||||
--- src/engine/video/image.cpp.orig Fri Mar 29 01:08:43 2013
|
||||
+++ src/engine/video/image.cpp Fri Jun 7 21:47:08 2013
|
||||
@@ -694,7 +694,7 @@ void ImageDescriptor::_GetPngImageInfo(const std::stri
|
||||
png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND, NULL);
|
||||
|
||||
// grab the relevant data...
|
||||
-#if PNG_LIBPNG_VER_SONUM == 15
|
||||
+#if PNG_LIBPNG_VER_SONUM >= 15
|
||||
cols = png_get_image_width(png_ptr, info_ptr);
|
||||
rows = png_get_image_height(png_ptr, info_ptr);
|
||||
bpp = png_get_bit_depth(png_ptr, info_ptr) * 8;
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_main_cpp,v 1.1.1.1 2013/03/13 15:49:53 bcallah Exp $
|
||||
--- src/main.cpp.orig Wed Mar 6 22:20:14 2013
|
||||
+++ src/main.cpp Wed Mar 6 22:20:34 2013
|
||||
@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
|
||||
// Now the program should be in app/Contents
|
||||
path.append("/Resources/");
|
||||
chdir(path.c_str());
|
||||
-#elif (defined(__linux__) || defined(__FreeBSD__)) && !defined(RELEASE_BUILD)
|
||||
+#elif (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(RELEASE_BUILD)
|
||||
// Look for data files in DATADIR only if they are not available in the current directory.
|
||||
if(std::ifstream("dat/config/settings.lua") == NULL) {
|
||||
if(chdir(PKG_DATADIR) != 0) {
|
||||
Loading…
x
Reference in New Issue
Block a user