This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit ad2e8ec954ded087c9664fef06bcb5ad88221954
Author: Tobias Frost <t...@coldtobi.de>
Date: Sat Jul 4 10:28:18 2015 +0200
Remove 75-local-no-precompiled-header.patch -- applied upstream
---
debian/changelog | 8 +
.../patches/75-local-no-precompiled-header.patch | 267 ---------------------
debian/patches/series | 1 -
3 files changed, 8 insertions(+), 268 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 200e00a..013223a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rbdoom3bfg (1.0.3+repack1+git20150625-1) UNRELEASED; urgency=medium
+
+ * New uptream git snapshot.
+ * Refresh 10-lowercase-executeable.patch
+ * Remove 75-local-no-precompiled-header.patch -- applied upstream
+
+ -- Tobias Frost <t...@debian.org> Sat, 04 Jul 2015 10:09:40 +0200
+
rbdoom3bfg (1.0.3+repack1-5) unstable; urgency=medium
* Generalized & Forwarded patch 80-disable-cpu-features.patch
diff --git a/debian/patches/75-local-no-precompiled-header.patch
b/debian/patches/75-local-no-precompiled-header.patch
deleted file mode 100644
index 5dece97..0000000
--- a/debian/patches/75-local-no-precompiled-header.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-Description: Do not precompile headers
- As this will break ccache (at least without introducing CCACHE_SLOPPINESS)
- Updated to use a CMake option to disable/enable
-Author: Tobias Frost <t...@debian.org>
-Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/229
-Applied-Upstream:
https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/edc3dfb55ab954894382b375236483aaed4dcc1d
-Last-Update: 2015-06-24
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/neo/idlib/CMakeLists.txt
-+++ b/neo/idlib/CMakeLists.txt
-@@ -101,6 +101,7 @@
-
- add_library(idlib ${ID_SOURCES_ALL} ${ID_INCLUDES_ALL})
- else()
-+ if (USE_PRECOMPILED_HEADERS)
- foreach( src_file ${ID_PRECOMPILED_SOURCES} )
- #message(STATUS "-include precompiled.h for ${src_file}")
- set_source_files_properties(
-@@ -109,9 +110,11 @@
- COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h"
- )
- endforeach()
--
-+ endif()
-+
- include_directories(.)
-
-+ if (USE_PRECOMPILED_HEADERS)
- # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
- STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
- SET(_compiler_FLAGS ${${_flags_var_name}})
-@@ -119,20 +122,25 @@
- FOREACH(item ${_directory_flags})
- LIST(APPEND _compiler_FLAGS " -I${item}")
- ENDFOREACH(item)
-+ endif()
-
- GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
- LIST(APPEND _compiler_FLAGS ${_directory_flags})
-
- SEPARATE_ARGUMENTS(_compiler_FLAGS)
-
-+ if (USE_PRECOMPILED_HEADERS)
- add_custom_target(precomp_header_idlib ALL
- COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header precompiled.h -o precompiled.h.gch
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMENT "Creating idlib/precompiled.h.gch for idlib"
- )
-+ endif()
-
- add_library(idlib ${ID_SOURCES_ALL} ${ID_INCLUDES_ALL})
-+ if (USE_PRECOMPILED_HEADERS)
- add_dependencies(idlib precomp_header_idlib)
-+ endif()
-
- endif()
-
---- a/neo/CMakeLists.txt
-+++ b/neo/CMakeLists.txt
-@@ -8,6 +8,9 @@
-
- option(MONOLITH
- "Embed game logic into main executable" ON)
-+
-+option(USE_PRECOMPILED_HEADERS
-+ "Use precompiled headers during build" ON)
-
- option(SDL2
- "Use SDL2 instead of SDL1.2" ON)
-@@ -1347,33 +1364,35 @@
-
- list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
-
-- set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES}
${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/framework/precompiled.cpp)
--
--
-- set_source_files_properties(
-- ${RBDOOM3_PRECOMPILED_SOURCES}
-- PROPERTIES
-- COMPILE_FLAGS "/Yuprecompiled.h"
-- OBJECT_DEPENDS "precompiled.pch"
--
-- )
-+ if(USE_PRECOMPILED_HEADERS)
-+ set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES}
${GLEW_SOURCES})
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/framework/precompiled.cpp)
-
-- set_source_files_properties(framework/precompiled.cpp
-- PROPERTIES
-- COMPILE_FLAGS "/Ycprecompiled.h"
-- OBJECT_OUTPUTS "precompiled.pch"
-- )
-+
-+ set_source_files_properties(
-+ ${RBDOOM3_PRECOMPILED_SOURCES}
-+ PROPERTIES
-+ COMPILE_FLAGS "/Yuprecompiled.h"
-+ OBJECT_DEPENDS "precompiled.pch"
-+
-+ )
-+
-+ set_source_files_properties(framework/precompiled.cpp
-+ PROPERTIES
-+ COMPILE_FLAGS "/Ycprecompiled.h"
-+ OBJECT_OUTPUTS "precompiled.pch"
-+ )
-+ endif()
-
- list(APPEND RBDOOM3_SOURCES ${WIN32_RESOURCES})
-
-@@ -1479,73 +1498,81 @@
-
- list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
-
-- set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES}
${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
-- list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
--
-- foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
-- #message(STATUS "-include precompiled.h for ${src_file}")
-- set_source_files_properties(
-- ${src_file}
-- PROPERTIES
-- COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h"
-- )
-- endforeach()
--
-- # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
-- STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
-- SET(_compiler_FLAGS ${${_flags_var_name}})
-- GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
-- FOREACH(item ${_directory_flags})
-- LIST(APPEND _compiler_FLAGS " -I${item}")
-- ENDFOREACH(item)
-+ if(USE_PRECOMPILED_HEADERS)
-+ set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${PNG_SOURCES} ${ZLIB_SOURCES}
${GLEW_SOURCES})
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder_SSE2.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
-+ list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/renderer/RenderLog.cpp)
-+
-+ foreach( src_file ${RBDOOM3_PRECOMPILED_SOURCES} )
-+ #message(STATUS "-include precompiled.h for
${src_file}")
-+ set_source_files_properties(
-+ ${src_file}
-+ PROPERTIES
-+ COMPILE_FLAGS "-include
${CMAKE_CURRENT_SOURCE_DIR}/idlib/precompiled.h"
-+ )
-+ endforeach()
-
-+ # precompiled magic for GCC/clang, adapted from
https://gist.github.com/573926
-+ STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}"
_flags_var_name)
-+ SET(_compiler_FLAGS ${${_flags_var_name}})
-+ GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
-+ FOREACH(item ${_directory_flags})
-+ LIST(APPEND _compiler_FLAGS " -I${item}")
-+ ENDFOREACH(item)
-+ endif()
-+
- GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
- LIST(APPEND _compiler_FLAGS ${_directory_flags})
- SEPARATE_ARGUMENTS(_compiler_FLAGS)
-
-- # we need to recreate the precompiled header for RBDoom3BFG
-- # (i.e. can't use the one created for idlib before)
-- # because some definitions (e.g. -D__IDLIB__ -D__DOOM_DLL__) differ
-- add_custom_target(precomp_header_rbdoom3bfg ALL
-- COMMAND ${CMAKE_CXX_COMPILER} ${_compiler_FLAGS} -x
c++-header idlib/precompiled.h -o idlib/precompiled.h.gch
-- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- COMMENT "Creating idlib/precompiled.h.gch for
RBDoom3BFG"
-- )
-+ if(USE_PRECOMPILED_HEADERS)
-+ # we need to recreate the precompiled header for RBDoom3BFG
-+ # (i.e. can't use the one created for idlib before)
-+ # because some definitions (e.g. -D__IDLIB__ -D__DOOM_DLL__)
differ
-+ add_custom_target(precomp_header_rbdoom3bfg ALL
-+ COMMAND ${CMAKE_CXX_COMPILER}
${_compiler_FLAGS} -x c++-header idlib/precompiled.h -o idlib/precompiled.h.gch
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+ COMMENT "Creating idlib/precompiled.h.gch for
RBDoom3BFG"
-+ )
-+ endif()
-
- if(WIN32)
- set(remove_command "del")
- else()
- set(remove_command "rm")
- endif()
-- # it's ugly enough that the precompiled header binary needs to be in
the
-- # source directory (instead of the build directory), so let's at least
-- # delete it after build.
-- add_custom_target(rm_precomp_header ALL
-- COMMAND ${remove_command} "idlib/precompiled.h.gch"
-- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- COMMENT "remove idlib/precompiled.h.gch"
-- )
-
-- # make sure this is run after creating idlib
-- add_dependencies(precomp_header_rbdoom3bfg idlib)
-+ if (USE_PRECOMPILED_HEADERS)
-+ # it's ugly enough that the precompiled header binary needs to
be in the
-+ # source directory (instead of the build directory), so let's
at least
-+ # delete it after build.
-+ add_custom_target(rm_precomp_header ALL
-+ COMMAND ${remove_command}
"idlib/precompiled.h.gch"
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+ COMMENT "remove idlib/precompiled.h.gch"
-+ )
-+
-+ # make sure this is run after creating idlib
-+ add_dependencies(precomp_header_rbdoom3bfg idlib)
-+ endif()
-
- add_executable(rbdoom3bfg WIN32 ${RBDOOM3_SOURCES})
--
-- # make sure precompiled header is created before executable is compiled
-- add_dependencies(rbdoom3bfg precomp_header_rbdoom3bfg)
--
-- # make sure precompiled header is deleted after executable is compiled
-- add_dependencies(rm_precomp_header rbdoom3bfg)
--
-+
-+ if (USE_PRECOMPILED_HEADERS)
-+ # make sure precompiled header is created before executable is
compiled
-+ add_dependencies(rbdoom3bfg precomp_header_rbdoom3bfg)
-+
-+ # make sure precompiled header is deleted after executable is
compiled
-+ add_dependencies(rm_precomp_header rbdoom3bfg)
-+ endif()
-
- if(NOT WIN32)
- if(NOT "${CMAKE_SYSTEM}" MATCHES "Darwin")
diff --git a/debian/patches/series b/debian/patches/series
index 57b4e22..3468b98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
10-lowercase-executeable.patch
65-init-sdl2.patch
-75-local-no-precompiled-header.patch
80-disable-cpu-features.patch
82-enable-hurd-kfreebsd.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
