[mupen64plus-input-sdl] 66/196: Remove upstream merged patches
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:00:17 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-input-sdl.
commit a6846ad6263d08acde8015251f7cf61659947e27
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Aug 28 19:46:53 2011 +0200
Remove upstream merged patches
---
debian/changelog | 4 +
debian/patches/2controllers-per-usb-device.patch | 31 ---
debian/patches/inputautocfg.patch | 154 ---------------
debian/patches/mouse_sensitivity.patch | 126 -------------
debian/patches/rewrite_makefile.patch | 231 -----------------------
debian/patches/series | 4 -
6 files changed, 4 insertions(+), 546 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e2527d6..329a3f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ mupen64plus-input-sdl (1.99.5~hg20110828-1) UNRELEASED; urgency=low
* debian/control:
- Add virtual package libsdl-dev as alternative build dependency
* Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+ * debian/patches:
+ - Remove upstream merged patches 2controllers-per-usb-device.patch,
+ patches/inputautocfg.patch, mouse_sensitivity.patch,
+ rewrite_makefile.patch
-- Sven Eckelmann <sven at narfation.org> Sun, 28 Aug 2011 18:58:47 +0200
diff --git a/debian/patches/2controllers-per-usb-device.patch b/debian/patches/2controllers-per-usb-device.patch
deleted file mode 100644
index cf0aeb7..0000000
--- a/debian/patches/2controllers-per-usb-device.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Correctly handle USB devices with multiple game pads
-Origin: upstream, http://bitbucket.org/richard42/mupen64plus-input-sdl/changeset/7fccdad2cdaf
-Author: Peter Helbing <phelbing at imap.cc>
-
----
-diff --git a/src/config.c b/src/config.c
-index 583124c81af03f41656f51295f06214675b00483..86aa513079f586abb8c6f56961cd4e30c9253626 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -399,10 +399,11 @@ void load_configuration(int bPrintSummary)
- sprintf(SectionName, "Input-SDL-Control%i", i + 1);
- readOK = load_controller_config(SectionName, i);
-
-- JoyName = get_sdl_joystick_name(i);
- if (!readOK || controller[i].device == DEVICE_AUTO)
- {
- int ControllersFound = 0;
-+ /* if auto / bad config, get joystick name based on SDL order */
-+ JoyName = get_sdl_joystick_name(i);
- /* reset the controller configuration again and try to auto-configure */
- ControllersFound = auto_set_defaults(i, JoyName);
- if (ControllersFound > 0)
-@@ -433,6 +434,8 @@ void load_configuration(int bPrintSummary)
- }
- else if (controller[i].device >= 0)
- {
-+ /* if joystick found in cfg, take its SDL number from there */
-+ JoyName = get_sdl_joystick_name(controller[i].device);
- /* valid joystick configuration was read; check if the specified joystick is available in SDL */
- if (JoyName == NULL)
- {
diff --git a/debian/patches/inputautocfg.patch b/debian/patches/inputautocfg.patch
deleted file mode 100644
index 0e5bbd4..0000000
--- a/debian/patches/inputautocfg.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Description: Update InputAutoCfg.ini from mercurial
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index f41d14b44f892115e1e6c040ecf374be1559b7ea..4483d9fdb61a16f0044d5abf98a206c7beec0189 100644
---- a/data/InputAutoCfg.ini
-+++ b/data/InputAutoCfg.ini
-@@ -125,6 +125,32 @@ Rumblepak switch = button(0)
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
-
-+; raphnet technologies USB converter (http://www.raphnet-tech.com/)
-+[GC/N64_USB]
-+plugged = True
-+plugin = 2
-+mouse = False
-+AnalogDeadzone = 4096,4096
-+AnalogPeak = 32768,32768
-+DPad R = button(13)
-+DPad L = button(12)
-+DPad D = button(11)
-+DPad U = button(10)
-+Start = button(3)
-+Z Trig = button(2)
-+B Button = button(1)
-+A Button = button(0)
-+C Button R = button(7)
-+C Button L = button(6)
-+C Button D = button(5)
-+C Button U = button(4)
-+R Trig = button(9)
-+L Trig = button(8)
-+Mempak switch =
-+Rumblepak switch =
-+X Axis = axis(0-,0+)
-+Y Axis = axis(1-,1+)
-+
- [GreenAsia Inc. USB Joystick]
- plugged = True
- plugin = 2
-@@ -175,6 +201,31 @@ Rumblepak switch =
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
-
-+[Jess Tech Colour Rumble Pad]
-+plugged = True
-+plugin = 1
-+mouse = False
-+AnalogDeadzone = 4096,4096
-+AnalogPeak = 32768,32768
-+DPad R = hat(0 Right)
-+DPad L = hat(0 Left)
-+DPad D = hat(0 Down)
-+DPad U = hat(0 Up)
-+Start = button(9)
-+Z Trig = button(4)
-+B Button = button(0)
-+A Button = button(2)
-+C Button R = axis(3+)
-+C Button L = axis(3-)
-+C Button D = axis(2+)
-+C Button U = axis(2-)
-+R Trig = button(7)
-+L Trig = button(5)
-+Mempak switch =
-+Rumblepak switch =
-+X Axis = axis(0-,0+)
-+Y Axis = axis(1-,1+)
-+
- [Logitech Cordless Rumblepad 2]
- [Logitech RumblePad 2 USB]
- [Logitech Dual Action]
-@@ -525,8 +576,7 @@ Rumblepak switch =
- Y Axis = axis(1-,1+)
- X Axis = axis(0-,0+)
-
--[Sony PLAYSTATION(R)3 Controller]
--[OSX: PLAYSTATION(R)3 Controller]
-+[PLAYSTATION(R)3 Controller]
- plugged = True
- plugin = 2
- mouse = False
-@@ -629,6 +679,8 @@ Y Axis = axis(1-,1+)
- [BigBen XBMiniPad Controller]
- [Joytech Wireless Advanced Controller]
- [Chinese-made Xbox Controller]
-+[Logitech Chillstream Controller]
-+[Generic X-Box pad]
- plugged = True
- plugin = 2
- mouse = False
-@@ -653,9 +705,60 @@ Rumblepak switch = button(2)
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
-
--[HuiJia USB GamePad]
- [OSX: USB GamePad]
- ; this is a 2-port USB device. The Right port is controller #1, the Left port is #2
-+; this is the "MayFlash" adapter, aka HuiJia. The OSX driver seems to have a
-+; different button mapping
-+plugged = True
-+plugin = 2
-+mouse = False
-+AnalogDeadzone = 2500,2500
-+AnalogPeak = 20000,20000
-+DPad R = button(13)
-+DPad L = button(15)
-+DPad D = button(14)
-+DPad U = button(12)
-+Start = button(9)
-+Z Trig = button(8)
-+B Button = button(2)
-+A Button = button(1)
-+C Button R = axis(1-)
-+C Button L = axis(1+)
-+C Button D = axis(0+)
-+C Button U = axis(0-)
-+R Trig = button(7)
-+L Trig = button(6)
-+Mempak switch = key(109)
-+Rumblepak switch = key(114)
-+X Axis = axis(2-,2+)
-+Y Axis = axis(3-,3+)
-+__NextController:
-+plugged = True
-+plugin = 2
-+mouse = False
-+AnalogDeadzone = 2500,2500
-+AnalogPeak = 20000,20000
-+DPad R = button(29)
-+DPad L = button(31)
-+DPad D = button(30)
-+DPad U = button(28)
-+Start = button(25)
-+Z Trig = button(24)
-+B Button = button(18)
-+A Button = button(17)
-+C Button R = axis(5-)
-+C Button L = axis(5+)
-+C Button D = axis(4+)
-+C Button U = axis(4-)
-+R Trig = button(23)
-+L Trig = button(22)
-+Mempak switch = key(109)
-+Rumblepak switch = key(114)
-+X Axis = axis(6-,6+)
-+Y Axis = axis(7-,7+)
-+
-+[HuiJia USB GamePad]
-+; this is a 2-port USB device. The Right port is controller #1, the Left port is #2
- plugged = True
- plugin = 2
- mouse = False
diff --git a/debian/patches/mouse_sensitivity.patch b/debian/patches/mouse_sensitivity.patch
deleted file mode 100644
index 7afed2f..0000000
--- a/debian/patches/mouse_sensitivity.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Description: Add mouse sensitivity
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-input-sdl/changeset/4840628890ed
-Author: Richard Goedeken <Richard at fascinationsoftware.com>
-
----
-diff --git a/src/config.c b/src/config.c
-index 86aa513079f586abb8c6f56961cd4e30c9253626..301b4f09c0c37fd4112ceb6f5eca1b5f857eb2f1 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -94,6 +94,7 @@ static void clear_controller(int iCtrlIdx)
- }
- for( b = 0; b < 2; b++ )
- {
-+ controller[iCtrlIdx].mouse_sens[b] = 2.0;
- controller[iCtrlIdx].axis_deadzone[b] = 4096;
- controller[iCtrlIdx].axis_peak[b] = 32768;
- controller[iCtrlIdx].axis[b].button_a = controller[iCtrlIdx].axis[b].button_b = -1;
-@@ -168,6 +169,11 @@ static int load_controller_config(const char *SectionName, int i)
- break;
- /* then do the optional parameters */
- ConfigGetParameter(pConfig, "mouse", M64TYPE_BOOL, &controller[i].mouse, sizeof(int));
-+ if (ConfigGetParameter(pConfig, "MouseSensitivity", M64TYPE_STRING, input_str, 256) == M64ERR_SUCCESS)
-+ {
-+ if (sscanf(input_str, "%f,%f", &controller[i].mouse_sens[0], &controller[i].mouse_sens[1]) != 2)
-+ DebugMessage(M64MSG_WARNING, "parsing error in MouseSensitivity parameter for controller %i", i + 1);
-+ }
- if (ConfigGetParameter(pConfig, "AnalogDeadzone", M64TYPE_STRING, input_str, 256) == M64ERR_SUCCESS)
- {
- if (sscanf(input_str, "%i,%i", &controller[i].axis_deadzone[0], &controller[i].axis_deadzone[1]) != 2)
-@@ -274,6 +280,8 @@ void save_controller_config(int iCtrlIdx)
- ConfigSetDefaultBool(pConfig, "mouse", controller[iCtrlIdx].mouse, "If True, then mouse buttons may be used with this controller");
- ConfigSetDefaultInt(pConfig, "device", controller[iCtrlIdx].device, "Specifies which joystick is bound to this controller: -2=Keyboard/mouse, -1=Auto config, 0 or more= SDL Joystick number");
-
-+ sprintf(Param, "%.2f,%.2f", controller[iCtrlIdx].mouse_sens[0], controller[iCtrlIdx].mouse_sens[1]);
-+ ConfigSetDefaultString(pConfig, "MouseSensitivity", Param, "Scaling factor for mouse movements. For X, Y axes.");
- sprintf(Param, "%i,%i", controller[iCtrlIdx].axis_deadzone[0], controller[iCtrlIdx].axis_deadzone[1]);
- ConfigSetDefaultString(pConfig, "AnalogDeadzone", Param, "The minimum absolute value of the SDL analog joystick axis to move the N64 controller axis value from 0. For X, Y axes.");
- sprintf(Param, "%i,%i", controller[iCtrlIdx].axis_peak[0], controller[iCtrlIdx].axis_peak[1]);
-diff --git a/src/plugin.c b/src/plugin.c
-index 0bdfcc9127bdb6cf0387495c1dd244508932b630..5f4a9367534931e6c9c9ddd9776c09e3cad49156 100644
---- a/src/plugin.c
-+++ b/src/plugin.c
-@@ -428,6 +428,8 @@ EXPORT void CALL ControllerCommand(int Control, unsigned char *Command)
- *******************************************************************/
- EXPORT void CALL GetKeys( int Control, BUTTONS *Keys )
- {
-+ static int mousex_residual = 0;
-+ static int mousey_residual = 0;
- int b, axis_val;
- SDL_Event event;
- unsigned char mstate;
-@@ -532,30 +534,43 @@ EXPORT void CALL GetKeys( int Control, BUTTONS *Keys )
- controller[Control].buttons.Value |= button_bits[b];
- }
-
-- if (controller[Control].mouse && SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON)
-+ if (controller[Control].mouse)
- {
-- SDL_PumpEvents();
-- while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_EVENTMASK(SDL_MOUSEMOTION)) == 1)
-+ if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON)
- {
-- if (event.motion.xrel)
-+ SDL_PumpEvents();
-+ while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_EVENTMASK(SDL_MOUSEMOTION)) == 1)
- {
-- axis_val = (event.motion.xrel * 10);
-- if (axis_val < -80)
-- axis_val = -80;
-- else if (axis_val > 80)
-- axis_val = 80;
-- controller[Control].buttons.X_AXIS = axis_val;
-- }
-- if (event.motion.yrel)
-- {
-- axis_val = (event.motion.yrel * 10);
-- if (axis_val < -80)
-- axis_val = -80;
-- else if (axis_val > 80)
-- axis_val = 80;
-- controller[Control].buttons.Y_AXIS = -axis_val;
-+ if (event.motion.xrel)
-+ {
-+ mousex_residual += (int) (event.motion.xrel * controller[Control].mouse_sens[0]);
-+ }
-+ if (event.motion.yrel)
-+ {
-+ mousey_residual += (int) (event.motion.yrel * controller[Control].mouse_sens[1]);
-+ }
- }
- }
-+ else
-+ {
-+ mousex_residual = 0;
-+ mousey_residual = 0;
-+ }
-+ axis_val = mousex_residual;
-+ if (axis_val < -80)
-+ axis_val = -80;
-+ else if (axis_val > 80)
-+ axis_val = 80;
-+ controller[Control].buttons.X_AXIS = axis_val;
-+ axis_val = mousey_residual;
-+ if (axis_val < -80)
-+ axis_val = -80;
-+ else if (axis_val > 80)
-+ axis_val = 80;
-+ controller[Control].buttons.Y_AXIS = -axis_val;
-+ /* the mouse x/y values decay exponentially */
-+ mousex_residual = (mousex_residual * 224) / 256;
-+ mousey_residual = (mousey_residual * 224) / 256;
- }
-
- #ifdef _DEBUG
-diff --git a/src/plugin.h b/src/plugin.h
-index e64aa0dbc27587ff021bbf195ad121181430532c..c0b81d1a55f8df00a21baa9ad24d9bd693ff2984 100644
---- a/src/plugin.h
-+++ b/src/plugin.h
-@@ -99,6 +99,7 @@ typedef struct
- int event_joystick; // the /dev/input/eventX device for force feeback
- int axis_deadzone[2]; // minimum absolute value before analog movement is recognized
- int axis_peak[2]; // highest analog value returned by SDL, used for scaling
-+ float mouse_sens[2]; // mouse sensitivity
- } SController;
-
- /* global data definitions */
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
deleted file mode 100644
index dc12038..0000000
--- a/debian/patches/rewrite_makefile.patch
+++ /dev/null
@@ -1,231 +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 0a0d7abae1363bdabc972f4fe116b89fae210529..2a212808f759b20b251018cf344cf3e5507f5f8b 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -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
-@@ -86,21 +92,25 @@ ifeq ("$(CPU)","NONE")
- $(error CPU type "$(HOST_CPU)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
- endif
-
--# base CFLAGS, LIBS, and LDFLAGS
--CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
--ifneq ($(OS), FREEBSD)
-- CFLAGS += -pipe -O3
--endif
-+# base CFLAGS, LDLIBS, and LDFLAGS
-+OPTFLAGS ?= -O3
-+CFLAGS += $(OPTFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
-+LDFLAGS += $(SHARED)
-
- # 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)
-- CFLAGS += -fpic -DPIC
-+ PIC ?= 1
- endif
-+ifeq ($(PIC), 1)
-+ CFLAGS += -fPIC
-+ LDFLAGS += -fPIC
-+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
-
- # set special flags per-system
-@@ -110,30 +120,20 @@ ifeq ($(OS), FREEBSD)
- endif
- endif
- ifeq ($(OS), LINUX)
-- ifeq ($(CPU), X86)
-- ifeq ($(ARCH_DETECTED), 64BITS)
-- CFLAGS += -march=athlon64
-- LDFLAGS += -ldl
-- else
-- CFLAGS += -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
-- LDFLAGS += -ldl
-- endif
-- endif
-+ LDLIBS += -ldl
- endif
- ifeq ($(OS), OSX)
- ifeq ($(CPU), X86)
- ifeq ($(ARCH_DETECTED), 64BITS)
- CFLAGS += -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-- LDFLAGS += -ldl
-+ LDLIBS += -ldl
- else
- CFLAGS += -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-- LDFLAGS += -arch i686 -ldl
-+ LDFLAGS += -arch i686
-+ LDLIBS += -ldl
- endif
- endif
- endif
--ifeq ($(CPU), PPC)
-- CFLAGS += -mcpu=powerpc
--endif
-
- # test for presence of SDL
- ifeq ($(shell which sdl-config 2>/dev/null),)
-@@ -143,10 +143,10 @@ ifeq ("$(UNAME)","Darwin")
- CFLAGS += $(shell sdl-config --cflags)
- # sdl-config on mac screws up when we're trying to build a library and not an executable
- # SDL 1.3 is supposed to fix that, if it's ever released
-- LDFLAGS += -L/usr/local/lib -lSDL -Wl,-framework,Cocoa
-+ LDLIBS += -L/usr/local/lib -lSDL -Wl,-framework,Cocoa
- else
- CFLAGS += $(shell sdl-config --cflags)
-- LDFLAGS += $(shell sdl-config --libs)
-+ LDLIBS += $(shell sdl-config --libs)
- endif
-
- # set mupen64plus core API header path
-@@ -171,21 +171,29 @@ else
- endif
- endif
-
--# set shell function names
--CC ?= gcc
--CXX ?= g++
--LD ?= g++
--INSTALL ?= install
--ifeq ($(OS),OSX)
-- STRIP ?= strip -x
--else
-- STRIP ?= strip -s
-+# reduced compile output when running make without V=1
-+ifneq ($(findstring $(MAKEFLAGS),s),s)
-+ifndef V
-+ Q_CC = @echo ' CC '$@;
-+ Q_LD = @echo ' LD '$@;
- endif
-+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
-+LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH)
-
- # set special flags for given Makefile parameters
- ifeq ($(DEBUG),1)
- CFLAGS += -g
-- STRIP = true # disable binary strip
-+ INSTALL_STRIP_FLAG ?=
-+else
-+ INSTALL_STRIP_FLAG ?= -s
- endif
- ifeq ($(PLUGINDBG), 1)
- CFLAGS += -D_DEBUG
-@@ -199,7 +207,10 @@ ifeq ($(SHAREDIR),)
- SHAREDIR := $(PREFIX)/share/mupen64plus
- endif
- ifeq ($(LIBDIR),)
-- LIBDIR := $(PREFIX)/lib/mupen64plus
-+ LIBDIR := $(PREFIX)/lib
-+endif
-+ifeq ($(PLUGINDIR),)
-+ PLUGINDIR := $(LIBDIR)/mupen64plus
- endif
-
- SRCDIR = ../../src
-@@ -215,20 +226,12 @@ SOURCE = \
- # generate a list of object files build, make a temporary directory for them
- OBJECTS := $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(filter %.c, $(SOURCE)))
- OBJDIRS = $(dir $(OBJECTS))
--$(shell mkdir -p $(OBJDIRS))
-+$(shell $(MKDIR) $(OBJDIRS))
-
- # build dependency files
- CFLAGS += -MD
- -include $(OBJECTS:.o=.d)
-
--# reduced compile output when running make without V=1
--ifneq ($(findstring $(MAKEFLAGS),s),s)
--ifndef V
-- Q_CC = @echo ' CC '$@;
-- Q_LD = @echo ' LD '$@;
--endif
--endif
--
- # build targets
- TARGET = mupen64plus-input-sdl.$(SO_EXTENSION)
-
-@@ -243,38 +246,41 @@ 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 " SHAREDIR=path == path to install shared data files (default: PREFIX/share/mupen64plus)"
-- @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"
- @echo " PLUGINDBG=1 == print extra debugging information while running"
-+ @echo " V=1 == show verbose compiler output"
-
- all: $(TARGET)
-
- install: $(TARGET)
-- $(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)"
-- $(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)"
-- $(INSTALL) -d -v "$(DESTDIR)$(SHAREDIR)"
-+ $(INSTALL) -d "$(DESTDIR)$(PLUGINDIR)"
-+ $(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(PLUGINDIR)"
-+ $(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
- $(INSTALL) -m 0644 "../../data/InputAutoCfg.ini" "$(DESTDIR)$(SHAREDIR)"
-
- uninstall:
-- rm -f "$(DESTDIR)$(LIBDIR)/$(TARGET)"
-+ $(RM) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
-+ $(RM) "$(DESTDIR)$(SHAREDIR)/InputAutoCfg.ini"
-
- clean:
-- rm -rf ./_obj/* $(TARGET)
-- rmdir ./_obj
-+ $(RM) -r ./_obj $(TARGET)
-
- rebuild: clean all
-
--# build rules
--$(TARGET): $(OBJECTS)
-- $(Q_LD)$(CC) $(SHARED) $^ $(LDFLAGS) -o $@
-- $(STRIP) $@
--
-+# standard build rules
- $(OBJDIR)/%.o: $(SRCDIR)/%.c
-- $(Q_CC)$(CC) -o $@ $(CFLAGS) -c $<
-+ $(COMPILE.c) -o $@ $<
-
-+$(TARGET): $(OBJECTS)
-+ $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
-
-+.PHONY: all clean install uninstall targets
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 095e4d1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-rewrite_makefile.patch
-2controllers-per-usb-device.patch
-inputautocfg.patch
-mouse_sensitivity.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git
More information about the Pkg-games-commits
mailing list