Date: Sun, 2 Oct 2011 15:05:14 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/161244: [PATCH] audio/libmikmod: fix failed patching Message-ID: <20111002190514.9788928440@kirby.cyberbotx.com> Resent-Message-ID: <201110021910.p92JA52W012212@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161244
>Category: ports
>Synopsis: [PATCH] audio/libmikmod: fix failed patching
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 02 19:10:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Naram Qashat
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 8.2-RELEASE FreeBSD 8.2-RELEASE #3: Sun Feb 27 08:58:31 EST 2011 root@kirby.cyberbotx.com:/usr/obj/usr/src/sys/CBXKERN amd64
>Description:
- Fix failed patching of audio/libmikmod due to 2 patch files trying
to patch the same file.
Removed file(s):
- files/patch-playercode-mloader.c
>How-To-Repeat:
>Fix:
--- libmikmod.patch begins here ---
diff -ruN /usr/ports/audio/libmikmod/files/patch-playercode-mloader.c /kirby/shared/ports/libmikmod/files/patch-playercode-mloader.c
--- /usr/ports/audio/libmikmod/files/patch-playercode-mloader.c 2010-05-02 17:33:53.000000000 -0400
+++ /kirby/shared/ports/libmikmod/files/patch-playercode-mloader.c 1969-12-31 19:00:00.000000000 -0500
@@ -1,19 +0,0 @@
---- playercode/mloader.c.orig 2010-05-02 17:31:03.000000000 -0400
-+++ playercode/mloader.c 2010-05-02 17:32:25.000000000 -0400
-@@ -450,10 +450,12 @@
- if (!l->Init || l->Init()) {
- _mm_rewind(modreader);
- ok = l->Load(curious);
-- /* propagate inflags=flags for in-module samples */
-- for (t = 0; t < of.numsmp; t++)
-- if (of.samples[t].inflags == 0)
-- of.samples[t].inflags = of.samples[t].flags;
-+ if (ok) {
-+ /* propagate inflags=flags for in-module samples */
-+ for (t = 0; t < of.numsmp; t++)
-+ if (of.samples[t].inflags == 0)
-+ of.samples[t].inflags = of.samples[t].flags;
-+ }
- } else
- ok = 0;
-
--- libmikmod.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111002190514.9788928440>