This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository scorched3d.
commit b3055848c138ab1b3c75d228fa6df0afd9960db6 Author: Markus Koschany <[email protected]> Date: Fri Jul 15 17:39:05 2016 +0200 Drop 0003-remove-embedded-glew.patch --- debian/patches/0003-remove-embedded-glew.patch | 49 -------------------------- debian/patches/series | 1 - 2 files changed, 50 deletions(-) diff --git a/debian/patches/0003-remove-embedded-glew.patch b/debian/patches/0003-remove-embedded-glew.patch deleted file mode 100644 index ceda3a0..0000000 --- a/debian/patches/0003-remove-embedded-glew.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: removed the embedded copy of the GLEW library -Author: Stephen M. Webb <[email protected]> -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634843 - ---- a/configure-gl.m4 -+++ b/configure-gl.m4 -@@ -27,7 +27,8 @@ - if test `uname -s` == Darwin; then - GL_LIBS="-framework OpenGL" - else -- GL_LIBS="-lGL -lGLU -lpthread" -+ PKG_CHECK_MODULES([GLEW], [glew]) -+ GL_LIBS="$GLEW_LIBS -lGL -lGLU -lpthread" - fi - fi - ---- a/src/client/scorchedc/scorchedc.vcxproj -+++ b/src/client/scorchedc/scorchedc.vcxproj -@@ -535,7 +535,6 @@ - <ClCompile Include="..\dialogs\TutorialDialog.cpp" /> - <ClCompile Include="..\GLEXT\GLCamera.cpp" /> - <ClCompile Include="..\GLEXT\GLCameraFrustum.cpp" /> -- <ClCompile Include="..\GLEXT\glew.c" /> - <ClCompile Include="..\GLEXT\GLFont2d.cpp" /> - <ClCompile Include="..\GLEXT\GLFont2dFreeType.cpp" /> - <ClCompile Include="..\GLEXT\GLFont2dStorage.cpp" /> -@@ -1282,7 +1281,6 @@ - <ClInclude Include="..\dialogs\TutorialDialog.h" /> - <ClInclude Include="..\GLEXT\GLCamera.h" /> - <ClInclude Include="..\GLEXT\GLCameraFrustum.h" /> -- <ClInclude Include="..\GLEXT\glew.h" /> - <ClInclude Include="..\GLEXT\GLFont2d.h" /> - <ClInclude Include="..\GLEXT\GLFont2dFreeType.h" /> - <ClInclude Include="..\GLEXT\GLFont2dStorage.h" /> -@@ -1309,7 +1307,6 @@ - <ClInclude Include="..\GLEXT\GLVertexBufferObject.h" /> - <ClInclude Include="..\GLEXT\GLViewPort.h" /> - <ClInclude Include="..\GLEXT\glxew.h" /> -- <ClInclude Include="..\GLEXT\wglew.h" /> - <ClInclude Include="..\GLSL\GLSLProgram.h" /> - <ClInclude Include="..\GLSL\GLSLShader.h" /> - <ClInclude Include="..\GLSL\GLSLShaderSetup.h" /> -@@ -1604,4 +1601,4 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> --</Project> -\ No newline at end of file -+</Project> diff --git a/debian/patches/series b/debian/patches/series index db30f2f..7a37dc7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 0001-openal-pkgconfig.patch 0002-kfreebsd.patch -0003-remove-embedded-glew.patch 0004-ftbfs-gcc-4.7.patch 0005-append-buildflags.patch 0006-fix-freetype-includes.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scorched3d.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
