[mupen64plus-video-arachnoid] 97/147: Remove upstream merged gcc_lto.patch and unused_glu.patch
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:09:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-arachnoid.
commit a02ecd4490724b4c88e73b86fda025e8abd92f19
Author: Sven Eckelmann <sven at narfation.org>
Date: Wed Oct 10 21:42:53 2012 +0200
Remove upstream merged gcc_lto.patch and unused_glu.patch
---
debian/changelog | 2 +
debian/patches/gcc_lto.patch | 28 ------
debian/patches/series | 2 -
debian/patches/unused_glu.patch | 185 ----------------------------------------
4 files changed, 2 insertions(+), 215 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9b6a06d..d75949d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mupen64plus-video-arachnoid (1.99.5-1) UNRELEASED; urgency=low
* New Upstream Version
* Upgraded to policy 3.9.4, no changes required
+ * debian/patches:
+ - Remove upstream merged gcc_lto.patch and unused_glu.patch
-- Sven Eckelmann <sven at narfation.org> Wed, 19 Sep 2012 08:50:06 +0200
diff --git a/debian/patches/gcc_lto.patch b/debian/patches/gcc_lto.patch
deleted file mode 100644
index 8ce663c..0000000
--- a/debian/patches/gcc_lto.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Enable experimental support for link-time optimization
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index ade6a5da9211f0ed089c1cc1fdf029a928f6e556..2ff6a0d4e712860c8016bdc981f8d8edb59aaf80 100755
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -317,6 +317,7 @@ targets:
- @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)"
- @echo " Debugging Options:"
- @echo " DEBUG=1 == add debugging symbols"
-+ @echo " LTO=1 == enable experimental build with link-time optimization"
- @echo " V=1 == show verbose compiler output"
-
- all: $(TARGET)
-@@ -337,6 +338,11 @@ CFLAGS += -MD
- -include $(OBJECTS:.o=.d)
-
- CXXFLAGS += $(CFLAGS)
-+ifeq ($(LTO), 1)
-+ CFLAGS += -flto
-+ CXXFLAGS += -flto
-+ LDFLAGS += -fuse-linker-plugin $(CXXFLAGS)
-+endif
-
- # standard build rules
- $(OBJDIR)/%.o: $(SRCDIR)/%.c
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 640de5f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc_lto.patch
-unused_glu.patch
diff --git a/debian/patches/unused_glu.patch b/debian/patches/unused_glu.patch
deleted file mode 100644
index 9cf7fc1..0000000
--- a/debian/patches/unused_glu.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-Description: Remove unused dependency to GLU
- The OpenGL Utility Library was only used in a dead code path and can be
- removed without loosing any functionality.
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/msvc9/GraphicsPlugin.vcproj b/projects/msvc9/GraphicsPlugin.vcproj
-index ef34ea6b467bd96422ee218664cb49c5c3376011..72aa48485e72e2e8d11fc58385c7a2a1beea3a9a 100755
---- a/projects/msvc9/GraphicsPlugin.vcproj
-+++ b/projects/msvc9/GraphicsPlugin.vcproj
-@@ -64,7 +64,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="opengl32.lib glu32.lib"
-+ AdditionalDependencies="opengl32.lib"
- OutputFile="mupen64plus-video-arachnoid.dll"
- LinkIncremental="2"
- GenerateDebugInformation="true"
-@@ -143,7 +143,7 @@
- />
- <Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="opengl32.lib glu32.lib"
-+ AdditionalDependencies="opengl32.lib"
- OutputFile="mupen64plus-video-arachnoid.dll"
- LinkIncremental="1"
- GenerateDebugInformation="true"
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 2ff6a0d4e712860c8016bdc981f8d8edb59aaf80..d6f73a11e784a6a7a5c6a32ad2eaa9e4c8e83243 100755
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -120,12 +120,9 @@ else
- ifeq ($(shell pkg-config --modversion gl 2>/dev/null),)
- $(error No OpenGL development libraries found!)
- endif
-- ifeq ($(shell pkg-config --modversion glu 2>/dev/null),)
-- $(error No OpenGL utility development libraries found!)
-- endif
-
-- CFLAGS += -pthread $(shell pkg-config --cflags gl glu)
-- LDLIBS += -pthread $(shell pkg-config --libs gl glu)
-+ CFLAGS += -pthread $(shell pkg-config --cflags gl)
-+ LDLIBS += -pthread $(shell pkg-config --libs gl)
- endif
- ifeq ($(OS), LINUX)
- LDLIBS += -ldl
-diff --git a/src/GraphicsPlugin.cpp b/src/GraphicsPlugin.cpp
-index 1afc14e9c0b39e9f4cdb06ed781e5538951985eb..959c8f467237dc01bc65151f0c9b7e0e3dc99f6a 100755
---- a/src/GraphicsPlugin.cpp
-+++ b/src/GraphicsPlugin.cpp
-@@ -309,89 +309,6 @@ void renderRedBox(float x, float y, float z, float width, float height, float l
- glEnd();
- }
-
--void GraphicsPlugin::_motionBlur()
--{
-- glMatrixMode(GL_PROJECTION);
-- glLoadIdentity();
-- gluPerspective(45.0f,(GLfloat)800.0f/(GLfloat)600.0f, .5f ,150.0f);
--
-- glMatrixMode(GL_MODELVIEW);
-- glLoadIdentity();
-- gluLookAt(0, 0, 10, 0, 0, 0, 0, 1, 0);
--
-- ////Render new stuff to the motion blur texture
-- if ( animate(50) )
-- {
-- //Render to frame buffer
--// framebuffer01.beginRendering();
-- {
-- renderMotionBlur();
--
-- glMatrixMode(GL_PROJECTION);
-- glLoadIdentity();
-- gluPerspective(45.0f,(GLfloat)800.0f/(GLfloat)600.0f, .5f ,150.0f);
--
-- glMatrixMode(GL_MODELVIEW);
-- glLoadIdentity();
-- gluLookAt(0, 0, 10, 0, 0, 0, 0, 1, 0);
--
-- renderRedBox(0, 0, 0, 1, 5, 1);
-- //m_displayListParser->processDisplayList();
--
--
-- }
-- glFlush();
-- // framebuffer01.endRendering();
-- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-- }
--
-- //glDisable(GL_BLEND);
-- //glEnable(GL_DEPTH_TEST);
--
-- //renderMotionBlur();
-- //renderTriangle();
--
-- renderMotionBlur();
--
-- // glMatrixMode(GL_PROJECTION);
-- //glLoadIdentity();
-- //gluPerspective(45.0f,(GLfloat)800.0f/(GLfloat)600.0f, .5f ,150.0f);
--
-- // glMatrixMode(GL_MODELVIEW);
-- // glLoadIdentity();
-- //gluLookAt(0, 0, 10, 0, 0, 0, 0, 1, 0);
--
-- //renderRedBox(0, 0, 0, 1, 5, 1);
--
-- m_rdp.triggerInterrupt();
-- m_rsp.triggerInterrupt();
--
--
-- //Render new stuff to frame buffer
-- //framebuffer02.beginRendering();
-- {
-- // m_displayListParser->processDisplayList();
-- // RSP::getSingleton().reset();
-- // RDP::getSingleton().reset();
--
-- // glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-- // glDisable(GL_BLEND);
-- // glEnable(GL_DEPTH_TEST);
-- // glDisable(GL_ALPHA_TEST);
-- //m_displayListParser->processDisplayList();
-- }
-- //glFlush();
-- //framebuffer02.endRendering();
-- //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
--
-- //Blend old stuff and new stuff
--
-- //framebuffer02.render2();
--
-- //FrameBuffer::getSingleton().render();
--
--}
--
- //-----------------------------------------------------------------------------
- // ProcessDisplayList
- //-----------------------------------------------------------------------------
-@@ -448,18 +365,7 @@ void GraphicsPlugin::processDisplayList()
- m_rsp.reset();
- m_rdp.reset();
- m_openGLMgr.setCullMode(false, true);
--
--
-- if ( false )
-- {
-- _motionBlur();
-- }
-- else
-- {
-- m_displayListParser->processDisplayList();
--
-- }
--
-+ m_displayListParser->processDisplayList();
- }
-
- //Clear Screen?
-diff --git a/src/OpenGLManager.h b/src/OpenGLManager.h
-index 380a8c3b9129d08ace98ad289213e647351a9094..3359cf231208100adf0a1084cce3e0b1d501a141 100755
---- a/src/OpenGLManager.h
-+++ b/src/OpenGLManager.h
-@@ -26,7 +26,6 @@
- //OpenGL includes
- #include "m64p.h"
- #include "OpenGL.h"
--#include <GL/glu.h>
-
- //*****************************************************************************
- //* OpenGL Manager Class
-diff --git a/src/texture/ImageFormatSelector.cpp b/src/texture/ImageFormatSelector.cpp
-index 716368e9a512630a38bb6588a84d7b17790a985f..8d705966eea932875b5d179b4b300c364ac36ff0 100755
---- a/src/texture/ImageFormatSelector.cpp
-+++ b/src/texture/ImageFormatSelector.cpp
-@@ -32,7 +32,6 @@
- #include "GBIDefs.h"
- #include "m64p.h"
- #include "OpenGL.h"
--#include <GL/glu.h>
- #include "Memory.h"
-
- #ifndef GL_EXT_packed_pixels
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-arachnoid.git
More information about the Pkg-games-commits
mailing list