pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
arx-libertatis: remove, imported to pkgsrc
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Fri Sep 2 18:47:02 2016 +0200
Changeset: cd0a4e8ba0331856643a201a80869c3ac6878c5c
Removed Files:
arx-libertatis/DESCR
arx-libertatis/Makefile
arx-libertatis/PLIST
arx-libertatis/distinfo
arx-libertatis/patches/patch-CMakeLists.txt
arx-libertatis/patches/patch-cmake_CompileCheck.cmake
arx-libertatis/patches/patch-cmake_VersionString.cmake
arx-libertatis/patches/patch-src_graphics_opengl_OpenGLRenderer.cpp
arx-libertatis/patches/patch-src_io_fs_FilesystemPOSIX.cpp
arx-libertatis/patches/patch-src_platform_Thread.cpp
arx-libertatis/patches/patch-src_script_Script.cpp
Log Message:
arx-libertatis: remove, imported to pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd0a4e8ba0331856643a201a80869c3ac6878c5c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
arx-libertatis/DESCR | 4 --
arx-libertatis/Makefile | 34 ----------
arx-libertatis/PLIST | 10 ---
arx-libertatis/distinfo | 13 ----
arx-libertatis/patches/patch-CMakeLists.txt | 75 ----------------------
.../patches/patch-cmake_CompileCheck.cmake | 16 -----
.../patches/patch-cmake_VersionString.cmake | 56 ----------------
.../patch-src_graphics_opengl_OpenGLRenderer.cpp | 15 -----
.../patches/patch-src_io_fs_FilesystemPOSIX.cpp | 15 -----
.../patches/patch-src_platform_Thread.cpp | 18 ------
arx-libertatis/patches/patch-src_script_Script.cpp | 30 ---------
11 files changed, 286 deletions(-)
diffs:
diff --git a/arx-libertatis/DESCR b/arx-libertatis/DESCR
deleted file mode 100644
index f071824..0000000
--- a/arx-libertatis/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Arx Libertatis is a cross-platform, open source port of Arx Fatalis,
-a 2002 first-person role-playing game developed by Arkane Studios.
-
-This is the game engine - the data files are not included.
diff --git a/arx-libertatis/Makefile b/arx-libertatis/Makefile
deleted file mode 100644
index 3e29f6b..0000000
--- a/arx-libertatis/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-DISTNAME= arx-libertatis-1.1.2
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=project/arx/arx-libertatis-1.1.2/}
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://arx-libertatis.org/
-COMMENT= Cross-platform, open source port of the Arx Fatalis RPG
-LICENSE= gnu-gpl-v3
-
-USE_CMAKE= yes
-USE_LANGUAGES= c c++
-
-CMAKE_ARGS+= -D CMAKE_INSTALL_MANDIR:STRING:=${PKGMANDIR}
-CMAKE_ARGS+= -D USE_QT4:BOOL=OFF
-CMAKE_ARGS+= -D USE_QT5:BOOL=OFF
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+= NotDarwin
-
-.if ${OPSYS} != "Darwin"
-PLIST.NotDarwin= yes
-.endif
-
-.include "../../audio/openal-soft/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/glew/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/arx-libertatis/PLIST b/arx-libertatis/PLIST
deleted file mode 100644
index 294f538..0000000
--- a/arx-libertatis/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-bin/arx
-bin/arx-install-data
-bin/arxsavetool
-bin/arxunpak
-man/man1/arxsavetool.1
-man/man1/arxunpak.1
-man/man6/arx.6
-${PLIST.NotDarwin}share/applications/arx-libertatis.desktop
-${PLIST.NotDarwin}share/pixmaps/arx-libertatis.png
diff --git a/arx-libertatis/distinfo b/arx-libertatis/distinfo
deleted file mode 100644
index ae98063..0000000
--- a/arx-libertatis/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-SHA1 (arx-libertatis-1.1.2.tar.xz) = 3b14a55553c564fd33caafb3a5bdb2d328e1fde8
-RMD160 (arx-libertatis-1.1.2.tar.xz) = 94145d36664d8d747c0abc3ced9c9055fd642690
-SHA512 (arx-libertatis-1.1.2.tar.xz) = d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
-Size (arx-libertatis-1.1.2.tar.xz) = 970608 bytes
-SHA1 (patch-CMakeLists.txt) = 37a9c12a831ed6127a9c0a2e28bec2c3d7b6075d
-SHA1 (patch-cmake_CompileCheck.cmake) = b954b0115666741ffbd5686e997d24bae72a3196
-SHA1 (patch-cmake_VersionString.cmake) = afff2ae36425f3ffe0e1679d28e48ff4b6fc3d6f
-SHA1 (patch-src_graphics_opengl_OpenGLRenderer.cpp) = 410769fea6b911dcb283b1da85bebd2861de8d94
-SHA1 (patch-src_io_fs_FilesystemPOSIX.cpp) = 96f1938038c667997350f51a2bb201de0c9843e3
-SHA1 (patch-src_platform_Thread.cpp) = 38e31c77c9e6e795cb37842da82b5ed6681f6aea
-SHA1 (patch-src_script_Script.cpp) = 29a923b5254077e2dc2cd73f69afb89025ef7012
diff --git a/arx-libertatis/patches/patch-CMakeLists.txt b/arx-libertatis/patches/patch-CMakeLists.txt
deleted file mode 100644
index 424a78d..0000000
--- a/arx-libertatis/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-Fix use of CMAKE_MODULE_PATH (see also patch-cmake_VersionString.cmake)
-
-Resolve "Attempt at a recursive or nested TRY_COMPILE in directory"
-(see also patch-cmake_CompileCheck.cmake)
-
-and
-
-commit 60e43c3cbf3fb0aa10cc3092b2512ccebb60b80d
-Author: Daniel Scharrer <daniel%constexpr.org@localhost>
-Date: Tue Feb 23 07:04:11 2016 +0100
-
- CMake: Bump policy version to 3.4
-
- Amongst other things, this makes the build system more rubust against
- stray variables coming from included CMake scripts provided by the
- system by disabling variable expansion for quoted strings in if().
-
- Fixes build with CMake 3.5 (tested with 3.5.0-rc3).
-
-
---- CMakeLists.txt.orig 2013-10-17 17:25:04.000000000 +0000
-+++ CMakeLists.txt
-@@ -13,6 +13,11 @@ else()
- cmake_minimum_required(VERSION 2.8)
- endif()
-
-+if(CMAKE_VERSION VERSION_GREATER 3.4)
-+ cmake_policy(VERSION 3.4)
-+else()
-+ cmake_policy(VERSION ${CMAKE_VERSION})
-+endif()
-
- # Define configuration options
-
-@@ -174,10 +179,12 @@ mark_as_advanced(
- # Helper scrips
-
- include(CheckCXXSourceCompiles)
-+include(CheckIncludeFiles)
- include(CheckSymbolExists)
- include(CheckTypeSize)
-
--set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # For custom cmake modules
-+set(CMAKE_CUSTOM_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # For custom cmake modules
-+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CUSTOM_MODULE_PATH}) # For custom cmake modules
- include(BuildSystem)
- include(BuildType)
- include(CompileCheck)
-@@ -406,15 +413,15 @@ if(NOT MSVC)
- endif()
-
- # Not a symbol, so we can't use check_symbol_exists
-- check_compile(ARX_HAVE_BUILTIN_TRAP
-- "${CMAKE_MODULE_PATH}/check_compiler_builtin_trap.cpp"
-- "__builtin_trap" "compiler feature"
-- )
--
-- check_compile(ARX_HAVE_ATTRIBUTE_FORMAT_PRINTF
-- "${CMAKE_MODULE_PATH}/check_compiler_attribute_format_printf.cpp"
-- "__attribute__((format(printf, i, j)))" "compiler feature"
-- )
-+ #check_compile(ARX_HAVE_BUILTIN_TRAP
-+ # "${CMAKE_MODULE_PATH}/check_compiler_builtin_trap.cpp"
-+ # "__builtin_trap" "compiler feature"
-+ #)
-+
-+ #check_compile(ARX_HAVE_ATTRIBUTE_FORMAT_PRINTF
-+ # "${CMAKE_MODULE_PATH}/check_compiler_attribute_format_printf.cpp"
-+ # "__attribute__((format(printf, i, j)))" "compiler feature"
-+ #)
-
- check_symbol_exists(nanosleep "time.h" ARX_HAVE_NANOSLEEP)
-
diff --git a/arx-libertatis/patches/patch-cmake_CompileCheck.cmake b/arx-libertatis/patches/patch-cmake_CompileCheck.cmake
deleted file mode 100644
index e86a61e..0000000
--- a/arx-libertatis/patches/patch-cmake_CompileCheck.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cmake_CompileCheck.cmake,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-Resolve "Attempt at a recursive or nested TRY_COMPILE in directory"
-(see also patch-CMakeLists.txt)
-
---- cmake/CompileCheck.cmake.orig 2013-07-15 20:31:38.000000000 +0200
-+++ cmake/CompileCheck.cmake 2013-07-15 20:32:36.000000000 +0200
-@@ -52,7 +52,7 @@
-
- # Check if we can compile and link a simple file with the new flags
- try_compile(
-- check_compiler_flag ${CMAKE_BINARY_DIR} ${FILE}
-+ check_compiler_flag ${CMAKE_BINARY_DIR}/CMakeTmp ${FILE}
- CMAKE_FLAGS "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
- "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}"
- "-DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}"
diff --git a/arx-libertatis/patches/patch-cmake_VersionString.cmake b/arx-libertatis/patches/patch-cmake_VersionString.cmake
deleted file mode 100644
index 7b3e5ca..0000000
--- a/arx-libertatis/patches/patch-cmake_VersionString.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-cmake_VersionString.cmake,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-Fix use of CMAKE_MODULE_PATH (see also patch-CMakeLists.txt)
-
-and
-
-commit afca1491d7114066c016149b421bae4c797663a2
-Author: Daniel Scharrer <daniel%constexpr.org@localhost>
-Date: Tue Feb 23 07:08:48 2016 +0100
-
- VersionString.cmake: Guard against defined variables
-
- Previously this would fail under CMake older than 3.1 if "file" or
- "variable" were variables.
-
- For CMake 3.1+ this was fixed in commit 60e43c.
-
---- cmake/VersionString.cmake.orig 2013-10-17 17:25:04.000000000 +0000
-+++ cmake/VersionString.cmake
-@@ -26,19 +26,22 @@
- # The version file is regenerated whenever VERSION_FILE or the current commit changes.
- function(version_file SRC DST VERSION_SOURCES GIT_DIR)
-
-- set(mode "variable")
-+ set(MODE_VARIABLE 0)
-+ set(MODE_FILE 1)
-+
-+ set(mode ${MODE_VARIABLE})
-
- set(args)
-- set(dependencies "${CMAKE_MODULE_PATH}/VersionScript.cmake")
-+ set(dependencies "${CMAKE_CUSTOM_MODULE_PATH}/VersionScript.cmake")
-
- foreach(arg IN LISTS VERSION_SOURCES)
-
-- if(mode STREQUAL "variable")
-- set(mode "file")
-+ if(mode EQUAL MODE_VARIABLE)
-+ set(mode ${MODE_FILE})
- else()
- get_filename_component(arg "${arg}" ABSOLUTE)
- list(APPEND dependencies ${arg})
-- set(mode "variable")
-+ set(mode ${MODE_VARIABLE})
- endif()
-
- list(APPEND args ${arg})
-@@ -72,7 +75,7 @@ function(version_file SRC DST VERSION_SO
- "-DVERSION_SOURCES=${args}"
- "-DGIT_DIR=${abs_git_dir}"
- ${defines}
-- -P "${CMAKE_MODULE_PATH}/VersionScript.cmake"
-+ -P "${CMAKE_CUSTOM_MODULE_PATH}/VersionScript.cmake"
- MAIN_DEPENDENCY
- "${abs_src}"
- DEPENDS
diff --git a/arx-libertatis/patches/patch-src_graphics_opengl_OpenGLRenderer.cpp b/arx-libertatis/patches/patch-src_graphics_opengl_OpenGLRenderer.cpp
deleted file mode 100644
index 1c6cd1c..0000000
--- a/arx-libertatis/patches/patch-src_graphics_opengl_OpenGLRenderer.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_graphics_opengl_OpenGLRenderer.cpp,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-Turn off VBO if not available. This may help with performance issues.
-
---- ./src/graphics/opengl/OpenGLRenderer.cpp.orig 2012-06-08 21:12:01.000000000 +0200
-+++ ./src/graphics/opengl/OpenGLRenderer.cpp 2012-06-08 21:13:12.000000000 +0200
-@@ -148,6 +148,8 @@
- useVBOs = useVertexArrays;
- if(useVBOs && !GLEW_ARB_map_buffer_range) {
- LogWarning << "Missing OpenGL extension ARB_map_buffer_range, VBO performance will suffer.";
-+ LogWarning << "Turning VBO off.";
-+ useVBOs = false;
- }
-
- glEnable(GL_POLYGON_OFFSET_FILL);
diff --git a/arx-libertatis/patches/patch-src_io_fs_FilesystemPOSIX.cpp b/arx-libertatis/patches/patch-src_io_fs_FilesystemPOSIX.cpp
deleted file mode 100644
index c6a288e..0000000
--- a/arx-libertatis/patches/patch-src_io_fs_FilesystemPOSIX.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_io_fs_FilesystemPOSIX.cpp,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-Wrong errno.h include
-
---- src/io/fs/FilesystemPOSIX.cpp.orig 2013-07-15 20:56:44.000000000 +0200
-+++ src/io/fs/FilesystemPOSIX.cpp 2013-07-15 20:57:15.000000000 +0200
-@@ -27,7 +27,7 @@
- #include <cstdlib>
-
- #include <sys/stat.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <dirent.h>
- #include <unistd.h>
-
diff --git a/arx-libertatis/patches/patch-src_platform_Thread.cpp b/arx-libertatis/patches/patch-src_platform_Thread.cpp
deleted file mode 100644
index 1ec3862..0000000
--- a/arx-libertatis/patches/patch-src_platform_Thread.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_platform_Thread.cpp,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-Fix pthread_setname_np on NetBSD
-
---- src/platform/Thread.cpp.orig 2012-08-16 18:07:06.000000000 +0200
-+++ src/platform/Thread.cpp 2012-08-16 18:19:04.000000000 +0200
-@@ -96,7 +96,11 @@
- // Set the thread name.
- #if defined(ARX_HAVE_PTHREAD_SETNAME_NP) && ARX_PLATFORM != ARX_PLATFORM_MACOSX
- // Linux
-+# ifdef __NetBSD__
-+ pthread_setname_np(thread.thread, "%s", (void*)thread.threadName.c_str());
-+# else
- pthread_setname_np(thread.thread, thread.threadName.c_str());
-+# endif
- #elif defined(ARX_HAVE_PTHREAD_SETNAME_NP) && ARX_PLATFORM == ARX_PLATFORM_MACOSX
- // Mac OS X
- pthread_setname_np(thread.threadName.c_str());
diff --git a/arx-libertatis/patches/patch-src_script_Script.cpp b/arx-libertatis/patches/patch-src_script_Script.cpp
deleted file mode 100644
index f40d2af..0000000
--- a/arx-libertatis/patches/patch-src_script_Script.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_script_Script.cpp,v 1.1 2015/08/18 20:14:58 yhardy Exp $
-
-Something goes wrong with tolower and characters with value 0xA7,
-so only apply to characters in the range A-Z.
-
---- src/script/Script.cpp.orig 2013-07-15 19:56:03.000000000 +0200
-+++ src/script/Script.cpp 2013-07-15 19:57:38.000000000 +0200
-@@ -103,6 +103,13 @@
- SCR_TIMER * scr_timer = NULL;
- long ActiveTimers = 0;
-
-+static int ScriptToLower(int c) {
-+ if(c >= 'A' && c <= 'Z') {
-+ return tolower(c);
-+ }
-+ return c;
-+}
-+
- long FindScriptPos(const EERIE_SCRIPT * es, const string & str) {
-
- // TODO(script-parser) remove, respect quoted strings
-@@ -2150,7 +2157,7 @@
- script.data = file->readAlloc();
- script.size = file->size();
-
-- std::transform(script.data, script.data + script.size, script.data, ::tolower);
-+ std::transform(script.data, script.data + script.size, script.data, ::ScriptToLower);
-
- script.allowevents = 0;
-
Home |
Main Index |
Thread Index |
Old Index