[mupen64plus-video-arachnoid] 56/147: Remove upstream merged patches
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:09:48 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 d01e94b99861a60b68b1794c1617d0b94feeb4ff
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Aug 28 19:54:01 2011 +0200
Remove upstream merged patches
---
debian/changelog | 3 +
debian/patches/array_bounds.patch | 18 ---
debian/patches/mipmapping.patch | 125 ------------------
debian/patches/rewrite_makefile.patch | 239 ----------------------------------
debian/patches/series | 4 +-
5 files changed, 4 insertions(+), 385 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f353ecc..c04b5a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mupen64plus-video-arachnoid (1.99.5~hg20110828-1) UNRELEASED; urgency=low
* New upstream snapshot from revision 6bb944b2f66e
* Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+ * debian/patches:
+ - Remove upstream merged patches array_bounds.patch, mipmapping.patch,
+ rewrite_makefile.patch
-- Sven Eckelmann <sven at narfation.org> Sun, 28 Aug 2011 19:00:13 +0200
diff --git a/debian/patches/array_bounds.patch b/debian/patches/array_bounds.patch
deleted file mode 100644
index a9deda5..0000000
--- a/debian/patches/array_bounds.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix write past the end of m_fillColor
-Origin: upstream, https://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/changeset/6886c9e27c51
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/Combiner/CombinerBase.cpp b/src/Combiner/CombinerBase.cpp
-index c0cef06d28b7ef94df4336e8d8363aaef2dc4fb7..c9689490d6ae4ba1f4e19aee05da9101871daa4e 100755
---- a/src/Combiner/CombinerBase.cpp
-+++ b/src/Combiner/CombinerBase.cpp
-@@ -31,8 +31,6 @@ CombinerBase::CombinerBase()
- m_fillColor[1] = m_blendColor[1] = m_primColor[1] = m_envColor[1] = 0;
- m_fillColor[2] = m_blendColor[2] = m_primColor[2] = m_envColor[2] = 0;
- m_fillColor[3] = m_blendColor[3] = m_primColor[3] = m_envColor[3] = 1;
-- m_fillColor[4] = 0;
-- m_fillColor[5] = 0;
- }
-
- //-----------------------------------------------------------------------------
diff --git a/debian/patches/mipmapping.patch b/debian/patches/mipmapping.patch
deleted file mode 100644
index d241c0a..0000000
--- a/debian/patches/mipmapping.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Description: Add mipmapping support
-Origin: upstream, https://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/changeset/e963f7ab6022
-Author: Dorian Fevrier <dfevrier at quintaindustries.com>
-
----
-diff --git a/src/GraphicsPlugin.cpp b/src/GraphicsPlugin.cpp
-index c0641b816924de2b0cc1c4db6ff8c99ddbeb81b3..368f2aa86bab343b9d3047e6905a9fb964f3cdea 100755
---- a/src/GraphicsPlugin.cpp
-+++ b/src/GraphicsPlugin.cpp
-@@ -135,7 +135,7 @@ bool GraphicsPlugin::initialize(GFX_INFO* graphicsInfo)
- //Initialize Texture Cache
- //! @todo Not "hardcode" TextureBitDepth.
- m_textureCache.initialize(&m_rsp, &m_rdp, m_memory, 16);
--
-+ m_textureCache.setMipmap( m_config->mipmapping );
-
- //Initialize OpenGL Renderer
- if ( !OpenGLRenderer::getSingleton().initialize(&m_rsp, &m_rdp, &m_textureCache, m_vi, m_fogManager) )
-diff --git a/src/config/Config.cpp b/src/config/Config.cpp
-index d35aae600c93b624796827b06ea7a88e4adfc6d0..996a644e35e0b204982552fdda018d0423e0f43c 100755
---- a/src/config/Config.cpp
-+++ b/src/config/Config.cpp
-@@ -58,6 +58,7 @@ bool Config::initialize()
- ConfigSetDefaultBool(m_videoArachnoidSection, "Wireframe", false, "Render in wireframe?");
- ConfigSetDefaultBool(m_videoArachnoidSection, "Fog", false, "Render fog?");
- ConfigSetDefaultInt(m_videoArachnoidSection, "MultiSampling", 0, "Use MultiSampling? 0=no 2,4,8,16=quality");
-+ ConfigSetDefaultInt(m_videoArachnoidSection, "Mipmapping", 0, "Use Mipmapping? 0=no, 1=nearest, 2=bilinear, 3=trilinear");
- #ifdef WIN32
- ConfigSetDefaultInt(m_videoArachnoidSection, "ScreenUpdateSetting", SCREEN_UPDATE_CI, "When to update the screen: 1 - on VI, 2 - on first CI");
- #else
-@@ -79,5 +80,6 @@ void Config::load()
- m_cfg.wireframe = ConfigGetParamBool(m_videoArachnoidSection, "Wireframe");
- m_cfg.fog = ConfigGetParamBool(m_videoArachnoidSection, "Fog");
- m_cfg.multiSampling = ConfigGetParamBool(m_videoArachnoidSection, "MultiSampling");
-+ m_cfg.mipmapping = ConfigGetParamInt(m_videoArachnoidSection, "Mipmapping");
- m_cfg.screenUpdateSetting = ConfigGetParamInt(m_videoArachnoidSection, "ScreenUpdateSetting");
- }
-diff --git a/src/config/ConfigMap.h b/src/config/ConfigMap.h
-index e975ff5c4a7ccbe4669495199fec2c2279a1d9b0..05085f9ffa02aa337bf757e464e13eb92eb6768a 100755
---- a/src/config/ConfigMap.h
-+++ b/src/config/ConfigMap.h
-@@ -39,6 +39,7 @@ struct ConfigMap
- bool wireframe; //!< Render in wireframe? defualt = false
- bool fog; //!< Render fog? default = true
- int multiSampling; //!< Use MultiSampling? 0=no 2,4,8,16=quality default = 0
-+ int mipmapping; //!< Use Mipmapping? 0=no, 1=nearest, 2=bilinear, 3=trilinear default = 0
- int screenUpdateSetting; //!< When to redraw the screen default = SCREEN_UPDATE_VI
- };
-
-diff --git a/src/texture/TextureCache.cpp b/src/texture/TextureCache.cpp
-index e7eb39d87f65a66a08162e9118e0d1676d1ff8db..b1f7218cdb25c70cabaf3db9ee98f06cff869645 100755
---- a/src/texture/TextureCache.cpp
-+++ b/src/texture/TextureCache.cpp
-@@ -35,6 +35,7 @@
- //gSPBgRect1Cyc
- //gSPBgRectCopy
- #define GL_CLAMP_TO_EDGE 0x812F
-+#define GL_GENERATE_MIPMAP 0x8191
-
- #include "Logger.h"
- #include <iostream>
-@@ -576,8 +577,32 @@ void TextureCache::_activateTexture( unsigned int t, CachedTexture *texture )
- unsigned int textureFiltering = m_rdp->getTextureFiltering();
- if ( textureFiltering == G_TF_BILERP || textureFiltering == G_TF_AVERAGE )
- {
-- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-+ if( m_mipmap > 0 )
-+ {
-+ // Set Mipmap
-+ if(m_mipmap == 1) // nearest
-+ {
-+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
-+ }
-+ else if(m_mipmap == 2) // bilinear
-+ {
-+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
-+ }
-+ else if(m_mipmap == 3) // trilinear
-+ {
-+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-+ }
-+
-+ // Tell to hardware to generate mipmap (himself) when glTexImage2D is called
-+ glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-+ }
-+ else // no mipmapping
-+ {
-+ glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-+ glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE );
-+ }
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-+
- }
- else
- {
-@@ -585,6 +610,8 @@ void TextureCache::_activateTexture( unsigned int t, CachedTexture *texture )
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
- }
-
-+
-+
- // Set clamping modes
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, texture->clampS ? GL_CLAMP_TO_EDGE : GL_REPEAT );
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, texture->clampT ? GL_CLAMP_TO_EDGE : GL_REPEAT );
-diff --git a/src/texture/TextureCache.h b/src/texture/TextureCache.h
-index 26e137d3869d36d719a3a09b86e1ee1cf74a6afd..9712f89e3bbfc89575dfaa929e79555e716ccb90 100755
---- a/src/texture/TextureCache.h
-+++ b/src/texture/TextureCache.h
-@@ -50,6 +50,8 @@ public:
- void update(unsigned int tile);
- void dispose();
-
-+ void setMipmap( int value ) { m_mipmap = value; }
-+
- //Add and Remove
- CachedTexture* addTop();
- void removeBottom();
-@@ -81,6 +83,7 @@ private:
- unsigned int m_maxBytes; //!< Maximum number of bytes this cache have
- unsigned int m_cachedBytes; //!< Current number of bytes in cache
- unsigned int m_bitDepth; //!<
-+ int m_mipmap;
-
- //Cached textures
- typedef std::list<CachedTexture*> TextureList;
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
deleted file mode 100644
index 11a5620..0000000
--- a/debian/patches/rewrite_makefile.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-Description: Rewrite Makefile to fix flags and linking
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 762c0318deb37dab32d8b3d3f41937803d0704a7..d8133a9c37b72128249f4bd3e0ee1d62d02076ec 100755
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -39,7 +39,7 @@ ifneq ("$(filter GNU hurd,$(UNAME))","")
- endif
- ifeq ("$(UNAME)","Darwin")
- OS = OSX
-- LDFLAGS += -liconv -lpng
-+ LDLIBS += -liconv -lpng
- SO_EXTENSION = dylib
- SHARED = -bundle
- endif
-@@ -48,6 +48,12 @@ ifeq ("$(UNAME)","FreeBSD")
- SO_EXTENSION = so
- SHARED = -shared
- endif
-+ifeq ("$(UNAME)","OpenBSD")
-+ OS = FREEBSD
-+ SO_EXTENSION = so
-+ SHARED = -shared
-+ $(warning OS type "$(UNAME)" not officially supported.')
-+endif
- ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
- OS = LINUX
- SO_EXTENSION = so
-@@ -78,15 +84,14 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
- ARCH_DETECTED := 64BITS
- endif
-
--# base CFLAGS, LIBS, and LDFLAGS
--CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src \
-+# base CFLAGS, LDLIBS, and LDFLAGS
-+OPTFLAGS ?= -O3
-+CFLAGS += $(OPTFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src \
- -I../../src/hash -I../../src/ucodes -I../../src/GBI -I../../src/RDP -I../../src/utils \
- -I../../src/log -I../../src/RSP -I../../src/framebuffer -I../../src/math -I../../src/renderer \
- -I../../src/Assembler -I../../src/texture -I../../src/config -I../../src/Combiner
--ifneq ($(OS), FREEBSD)
-- CFLAGS += -pipe -O3
--endif
- CXXFLAGS += -fvisibility-inlines-hidden
-+LDFLAGS += $(SHARED)
-
- # On OS X, add a few extra flags to elegantly support cross-compilation and backward
- # compatibility (and also the flags to link against OpenGL)
-@@ -101,13 +106,36 @@ ifeq ($(OS), OSX)
- endif
- endif
- else
-- # flags for other Unices
-- LDFLAGS += -ldl -lGL -lGLU -lpthread
-+ # test for essential build dependencies
-+ ifeq ($(shell which pkg-config 2>/dev/null),)
-+ $(error pkg-config not found)
-+ endif
-+ 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)
-+endif
-+ifeq ($(OS), LINUX)
-+ LDLIBS += -ldl
-+endif
-+ifeq ($(OS), FREEBSD)
-+ LDLIBS += -lc
- endif
-
-
-+# Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
-+# On 32-bit systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch
- ifeq ($(ARCH_DETECTED), 64BITS)
-+ PIC ?= 1
-+endif
-+ifeq ($(PIC), 1)
- CFLAGS += -fPIC
-+ LDFLAGS += -fPIC
- endif
-
- # set mupen64plus core API header path
-@@ -137,15 +165,10 @@ ifeq ($(OS), LINUX)
- endif
- ifneq ($(OS), FREEBSD)
- ifeq ($(CPU), X86)
-- ifeq ($(ARCH_DETECTED), 64BITS)
-- CFLAGS += -march=athlon64
-- else
-- CFLAGS += -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
-- endif
- # tweak flags for 32-bit build on 64-bit system
- ifeq ($(ARCH_DETECTED), 64BITS_32)
- CFLAGS += -m32
-- LDFLAGS += -m32 -m elf_i386
-+ LDFLAGS += -m32 -Wl,-m,elf_i386
- endif
- endif
- else
-@@ -153,26 +176,32 @@ else
- $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
- endif
- endif
--ifeq ($(CPU), PPC)
-- CFLAGS += -mcpu=powerpc
--endif
-
--# set shell function names
--# set shell function names
--CC ?= gcc
--CXX ?= g++
--INSTALL ?= install
--ifeq ($(OS),LINUX)
-- STRIP = strip -s
-+# reduced compile output when running make without V=1
-+ifneq ($(findstring $(MAKEFLAGS),s),s)
-+ifndef V
-+ Q_CC = @echo ' CC '$@;
-+ Q_CXX = @echo ' CXX '$@;
-+ Q_LD = @echo ' LD '$@;
- endif
--ifeq ($(OS),OSX)
-- STRIP = strip -x
- endif
-
-+# set base program pointers and flags
-+CC ?= gcc
-+CXX ?= g++
-+RM ?= rm -f
-+INSTALL ?= install
-+MKDIR ?= mkdir -p
-+COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
-+COMPILE.cc = $(Q_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
-+LINK.o = $(Q_LD)$(CXX) $(LDFLAGS) $(TARGET_ARCH)
-+
- # set special flags for given Makefile parameters
- ifeq ($(DEBUG),1)
-- CFLAGS += -g -fno-inline -Werror
-- STRIP = true # disable binary strip
-+ CFLAGS += -g
-+ INSTALL_STRIP_FLAG ?=
-+else
-+ INSTALL_STRIP_FLAG ?= -s
- endif
-
- # set installation options
-@@ -183,7 +212,10 @@ ifeq ($(SHAREDIR),)
- SHAREDIR := $(PREFIX)/share/mupen64plus
- endif
- ifeq ($(LIBDIR),)
-- LIBDIR := $(PREFIX)/lib/mupen64plus
-+ LIBDIR := $(PREFIX)/lib
-+endif
-+ifeq ($(PLUGINDIR),)
-+ PLUGINDIR := $(LIBDIR)/mupen64plus
- endif
-
-
-@@ -249,7 +281,7 @@ SOURCE = \
- # generate a list of object files build, make a temporary directory for them
- OBJECTS := $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(SOURCE)))
- OBJDIRS = $(dir $(OBJECTS))
--$(shell mkdir -p $(OBJDIRS))
-+$(shell $(MKDIR) $(OBJDIRS))
-
- # build targets
-
-@@ -265,9 +297,12 @@ targets:
- @echo " Options:"
- @echo " BITS=32 == build 32-bit binaries on 64-bit machine"
- @echo " APIDIR=path == path to find Mupen64Plus Core headers"
-+ @echo " OPTFLAGS=flag == compiler optimization (default: -O3)"
-+ @echo " PIC=(1|0) == Force enable/disable of position independent code"
- @echo " Install Options:"
- @echo " PREFIX=path == install/uninstall prefix (default: /usr/local)"
-- @echo " LIBDIR=path == path to install plugin libraries (default: PREFIX/lib/mupen64plus)"
-+ @echo " LIBDIR=path == library prefix (default: PREFIX/lib)"
-+ @echo " PLUGINDIR=path == path to install plugin libraries (default: LIBDIR/mupen64plus)"
- @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)"
- @echo " Debugging Options:"
- @echo " DEBUG=1 == add debugging symbols"
-@@ -276,15 +311,15 @@ targets:
- all: $(TARGET)
-
- install: $(TARGET)
-- $(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)"
-- $(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)"
-+ $(INSTALL) -d "$(DESTDIR)$(PLUGINDIR)"
-+ $(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(PLUGINDIR)"
-
- uninstall:
-- rm -f "$(DESTDIR)$(LIBDIR)/$(TARGET)"
-+ $(RM) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
-
-
- clean:
-- rm -rf ./_obj mupen64plus-video-arachnoid.$(SO_EXTENSION)
-+ $(RM) -r ./_obj mupen64plus-video-arachnoid.$(SO_EXTENSION)
-
- # build dependency files
- CFLAGS += -MD
-@@ -292,22 +327,14 @@ CFLAGS += -MD
-
- CXXFLAGS += $(CFLAGS)
-
--# reduced compile output when running make without V=1
--ifneq ($(findstring $(MAKEFLAGS),s),s)
--ifndef V
-- Q_CC = @echo ' CC '$@;
-- Q_CXX = @echo ' CXX '$@;
-- Q_LD = @echo ' LD '$@;
--endif
--endif
--
--# build rules
--$(TARGET): $(OBJECTS)
-- $(Q_LD)$(CXX) $(SHARED) $^ $(LDFLAGS) -o $@
-- $(STRIP) $@
--
-+# standard build rules
- $(OBJDIR)/%.o: $(SRCDIR)/%.c
-- $(Q_CC)$(CC) -o $@ $(CFLAGS) -c $<
-+ $(COMPILE.c) -o $@ $<
-
- $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
-- $(Q_CXX)$(CXX) -o $@ $(CXXFLAGS) -c $<
-+ $(COMPILE.cc) -o $@ $<
-+
-+$(TARGET): $(OBJECTS)
-+ $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+
-+.PHONY: all clean install uninstall targets
diff --git a/debian/patches/series b/debian/patches/series
index 81f4313..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-rewrite_makefile.patch
-array_bounds.patch
-mipmapping.patch
+
--
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