summaryrefslogtreecommitdiff
path: root/Ports
diff options
context:
space:
mode:
authorAli Mohammad Pur <ali.mpfard@gmail.com>2022-05-16 19:21:52 +0430
committerAli Mohammad Pur <Ali.mpfard@gmail.com>2022-05-19 20:17:10 +0430
commit6c2009f91542ebce50298b919b71c450a846b5a5 (patch)
tree86cdbed45aa39d8a57c2811a9a348d6720a95060 /Ports
parent70a8cb0ac37ef29be4dd07713adf4a8b0c415a0a (diff)
downloadserenity-6c2009f91542ebce50298b919b71c450a846b5a5.zip
Ports: Update libmpg123's patches to use git patches
Diffstat (limited to 'Ports')
-rw-r--r--Ports/libmpg123/patches/0001-Teach-the-multiple-configure-files-that-serenity-is-.patch (renamed from Ports/libmpg123/patches/add-serenity-target.patch)30
-rw-r--r--Ports/libmpg123/patches/ReadMe.md8
2 files changed, 27 insertions, 11 deletions
diff --git a/Ports/libmpg123/patches/add-serenity-target.patch b/Ports/libmpg123/patches/0001-Teach-the-multiple-configure-files-that-serenity-is-.patch
index 123ffeb5cb..047e0d390b 100644
--- a/Ports/libmpg123/patches/add-serenity-target.patch
+++ b/Ports/libmpg123/patches/0001-Teach-the-multiple-configure-files-that-serenity-is-.patch
@@ -1,3 +1,14 @@
+From 21ff6032ff3fc0afe704d2363661c2a227911649 Mon Sep 17 00:00:00 2001
+From: Michael Manganiello <adamantike@users.noreply.github.com>
+Date: Sat, 26 Mar 2022 13:15:31 -0300
+Subject: [PATCH] Teach the multiple configure files that serenity is a thing
+
+---
+ configure | 4 ++--
+ configure.ac | 4 ++--
+ m4/libtool.m4 | 18 +++++++++---------
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
diff --git a/configure b/configure
index d3404be..809a412 100755
--- a/configure
@@ -17,7 +28,7 @@ index d3404be..809a412 100755
;;
*-*-linux*|*-*-kfreebsd*-gnu)
diff --git a/configure.ac b/configure.ac
-index 3ca8766..383120e 100644
+index 3ca8766..fcffff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -709,11 +709,11 @@ case $host in
@@ -40,7 +51,7 @@ index a6d21ae..44d3c98 100644
+++ b/m4/libtool.m4
@@ -2836,7 +2836,7 @@ linux*android*)
;;
-
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
@@ -49,13 +60,13 @@ index a6d21ae..44d3c98 100644
need_version=no
@@ -3553,7 +3553,7 @@ irix5* | irix6* | nonstopux*)
;;
-
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
lt_cv_deplibs_check_method=pass_all
;;
-
+
@@ -4372,7 +4372,7 @@ m4_if([$1], [CXX], [
;;
esac
@@ -68,7 +79,7 @@ index a6d21ae..44d3c98 100644
@@ -4696,7 +4696,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
-
+
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
case $cc_basename in
@@ -95,7 +106,7 @@ index a6d21ae..44d3c98 100644
@@ -5197,7 +5197,7 @@ _LT_EOF
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
-
+
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu | serenity*)
tmp_diet=no
@@ -104,7 +115,7 @@ index a6d21ae..44d3c98 100644
@@ -5809,7 +5809,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
-
+
- linux*)
+ linux* | serenity*)
case $cc_basename in
@@ -113,9 +124,12 @@ index a6d21ae..44d3c98 100644
@@ -6952,7 +6952,7 @@ if test yes != "$_lt_caught_CXX_error"; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
-
+
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | serenity*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
+--
+2.36.1
+
diff --git a/Ports/libmpg123/patches/ReadMe.md b/Ports/libmpg123/patches/ReadMe.md
index a46164a3b9..612c6c3b7f 100644
--- a/Ports/libmpg123/patches/ReadMe.md
+++ b/Ports/libmpg123/patches/ReadMe.md
@@ -1,5 +1,7 @@
-# Patches for mpg123 on SerenityOS
+# Patches for libmpg123 on SerenityOS
+
+## `0001-Teach-the-multiple-configure-files-that-serenity-is-.patch`
+
+Teach the multiple configure files that serenity is a thing
-## `add-serenity-target.patch`
-Add `serenity` as a valid target.