summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Mohammad Pur <ali.mpfard@gmail.com>2022-05-16 19:21:27 +0430
committerAli Mohammad Pur <Ali.mpfard@gmail.com>2022-05-19 20:17:10 +0430
commit7574dc02582ea73c3d5763314eaff65544a3e069 (patch)
treebeb4747b98852e9ad8c6b6007fb982dcf6c27cb6
parentf901f98814a1b6cab1c08f83b2c95d42636e5c34 (diff)
downloadserenity-7574dc02582ea73c3d5763314eaff65544a3e069.zip
Ports: Update SDL2-mixer's patches to use git patches
-rw-r--r--Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch (renamed from Ports/SDL2_mixer/patches/dont-build-utilities.patch)29
-rw-r--r--Ports/SDL2_mixer/patches/ReadMe.md7
2 files changed, 28 insertions, 8 deletions
diff --git a/Ports/SDL2_mixer/patches/dont-build-utilities.patch b/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch
index ef2af83b9f..eef1a7b92c 100644
--- a/Ports/SDL2_mixer/patches/dont-build-utilities.patch
+++ b/Ports/SDL2_mixer/patches/0001-Skip-building-the-playmus-and-playwav-utilities.patch
@@ -1,7 +1,17 @@
-diff -ru SDL2_mixer-2.0.4/Makefile.in SDL2_mixer-2.0.4-patched/Makefile.in
---- SDL2_mixer-2.0.4/Makefile.in 2018-10-31 15:58:59.000000000 +0100
-+++ SDL2_mixer-2.0.4-patched/Makefile.in 2021-03-08 13:11:59.083146376 +0100
-@@ -38,7 +38,7 @@
+From a8e2b31abe3f56f21b4835af00620ce29ce6becb Mon Sep 17 00:00:00 2001
+From: Andreas Kling <kling@serenityos.org>
+Date: Mon, 8 Mar 2021 13:15:35 +0100
+Subject: [PATCH] Skip building the playmus and playwav utilities
+
+---
+ Makefile.in | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2ff24b2..0e120a1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -38,7 +38,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@
PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
@@ -10,7 +20,7 @@ diff -ru SDL2_mixer-2.0.4/Makefile.in SDL2_mixer-2.0.4-patched/Makefile.in
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -19,7 +29,7 @@ diff -ru SDL2_mixer-2.0.4/Makefile.in SDL2_mixer-2.0.4-patched/Makefile.in
$(srcdir)/configure: $(srcdir)/configure.in
@echo "Warning, configure.in is out of date"
-@@ -64,12 +64,6 @@
+@@ -64,12 +64,6 @@ $(objects):
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
@@ -32,7 +42,7 @@ diff -ru SDL2_mixer-2.0.4/Makefile.in SDL2_mixer-2.0.4-patched/Makefile.in
install: all install-hdrs install-lib #install-bin
install-hdrs:
$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL2
-@@ -84,8 +78,6 @@
+@@ -84,8 +78,6 @@ install-lib: $(objects) $(objects)/$(TARGET)
$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
install-bin:
$(SHELL) $(auxdir)/mkinstalldirs $(bindir)
@@ -41,7 +51,7 @@ diff -ru SDL2_mixer-2.0.4/Makefile.in SDL2_mixer-2.0.4-patched/Makefile.in
uninstall: uninstall-hdrs uninstall-lib uninstall-bin
uninstall-hdrs:
-@@ -99,8 +91,6 @@
+@@ -99,8 +91,6 @@ uninstall-hdrs:
uninstall-lib:
$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET)
uninstall-bin:
@@ -50,3 +60,6 @@ diff -ru SDL2_mixer-2.0.4/Makefile.in SDL2_mixer-2.0.4-patched/Makefile.in
clean:
rm -rf $(objects)
+--
+2.36.1
+
diff --git a/Ports/SDL2_mixer/patches/ReadMe.md b/Ports/SDL2_mixer/patches/ReadMe.md
new file mode 100644
index 0000000000..3744f95d5d
--- /dev/null
+++ b/Ports/SDL2_mixer/patches/ReadMe.md
@@ -0,0 +1,7 @@
+# Patches for SDL2_mixer on SerenityOS
+
+## `0001-Skip-building-the-playmus-and-playwav-utilities.patch`
+
+Skip building the playmus and playwav utilities
+
+