From dcp1990@fez.theamigan.net  Tue Oct 10 23:16:14 2006
Return-Path: <dcp1990@fez.theamigan.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 97C7416A416
	for <freebsd-gnats-submit@freebsd.org>; Tue, 10 Oct 2006 23:16:14 +0000 (UTC)
	(envelope-from dcp1990@fez.theamigan.net)
Received: from centrmmtao04.cox.net (centrmmtao04.cox.net [70.168.83.80])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BB1F643D7E
	for <freebsd-gnats-submit@freebsd.org>; Tue, 10 Oct 2006 23:15:58 +0000 (GMT)
	(envelope-from dcp1990@fez.theamigan.net)
Received: from eastrmimpo01.cox.net ([68.1.16.119]) by centrmmtao04.cox.net
          (InterMail vM.6.01.06.01 201-2131-130-101-20060113) with ESMTP
          id <20061010231558.FAUA16408.centrmmtao04.cox.net@eastrmimpo01.cox.net>;
          Tue, 10 Oct 2006 19:15:58 -0400
Received: from styx.theamigan.net ([68.1.188.254])
	by eastrmimpo01.cox.net with bizsmtp
	id YnFi1V00P5VloKG0000000
	Tue, 10 Oct 2006 19:15:43 -0400
Received: from fez.theamigan.net (fez.danponte.net [10.10.10.2])
	by styx.theamigan.net (8.13.6/8.13.4) with ESMTP id k9ANFvCl080272;
	Tue, 10 Oct 2006 19:15:57 -0400 (EDT)
	(envelope-from dcp1990@fez.theamigan.net)
Received: from fez.theamigan.net (localhost.theamigan.net [127.0.0.1])
	by fez.theamigan.net (8.13.8/8.13.8) with ESMTP id k9AN9juF020049;
	Tue, 10 Oct 2006 19:09:45 -0400 (EDT)
	(envelope-from dcp1990@fez.theamigan.net)
Received: (from dcp1990@localhost)
	by fez.theamigan.net (8.13.8/8.13.8/Submit) id k9AN9itS020048;
	Tue, 10 Oct 2006 19:09:44 -0400 (EDT)
	(envelope-from dcp1990)
Message-Id: <200610102309.k9AN9itS020048@fez.theamigan.net>
Date: Tue, 10 Oct 2006 19:09:44 -0400 (EDT)
From: Dan Ponte <dcp1990@neptune.atopia.net>
Reply-To: Dan Ponte <dcp1990@neptune.atopia.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dan@theamigan.net
Subject: [PATCH] Make libmikmod work on amd64
X-Send-Pr-Version: 3.113
X-GNATS-Notify: david@dyn-ns.net

>Number:         104280
>Category:       ports
>Synopsis:       [PATCH] Make libmikmod work on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 10 23:20:14 GMT 2006
>Closed-Date:    Thu Oct 12 08:43:21 GMT 2006
>Last-Modified:  Thu Oct 12 08:50:17 GMT 2006
>Originator:     Dan Ponte
>Release:        FreeBSD 6.2-PRERELEASE amd64
>Organization:
Unix Users Anonymous
>Environment:
System: FreeBSD fez.theamigan.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #17: Wed Sep 27 06:10:55 EDT 2006 root@fez.theamigan.net:/usr/obj/usr/src/sys/FEZ amd64

libmikmod-esound-3.1.11_1 (non esound also affected I'd wager)
>Description:
	mikmod would usually sound like complete and utter crap when I played anything on an amd64 machine, but my i386 machines worked fine. It turns out that only __arch64__ and __alpha were being checked and not __amd64. This fixes it.
>How-To-Repeat:
	Use mikmod.
>Fix:
	Apply these patches.

--- patch-include_mikmod.h.in begins here ---
--- include/mikmod.h.in.orig	Tue Oct 10 19:04:20 2006
+++ include/mikmod.h.in	Tue Oct 10 19:04:32 2006
@@ -85,7 +85,7 @@ typedef char CHAR;
 
 @DOES_NOT_HAVE_SIGNED@
 
-#if defined(__arch64__) || defined(__alpha)
+#if defined(__arch64__) || defined(__alpha) || defined(__amd64)
 /* 64 bit architectures */
 
 typedef signed char     SBYTE;      /* 1 byte, signed */
--- patch-include_mikmod.h.in ends here ---

--- patch-include_mikmod_internals.h begins here ---
--- include/mikmod_internals.h.orig	Tue Oct 10 19:03:44 2006
+++ include/mikmod_internals.h	Tue Oct 10 19:04:47 2006
@@ -50,7 +50,7 @@ extern "C" {
 /*========== More type definitions */
 
 /* SLONGLONG: 64bit, signed */
-#if defined (__arch64__) || defined(__alpha)
+#if defined (__arch64__) || defined(__alpha) || defined(__amd64)
 typedef long		SLONGLONG;
 #define NATIVE_64BIT_INT
 #elif defined(__WATCOMC__)
--- patch-include_mikmod_internals.h ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Oct 10 23:31:50 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104280 

From: "David Le Brun" <david@dyn-ns.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104280: [PATCH] Make audio/libmikmod work on amd64
Date: Wed, 11 Oct 2006 09:12:41 +0200 (CEST)

 Hey Edwin and Dan,
 
 > Please note that PR ports/104280 has just been submitted.
 
 I don't have access to any amd64 computer but the patch looks good.
 So, it's ok to commit this patch.
 
 Thanks Dan for your help.
 David
 
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Wed Oct 11 08:42:47 UTC 2006 
Responsible-Changed-Why:  
Eat. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104280 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Wed Oct 11 11:57:01 UTC 2006 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104280 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Thu Oct 12 08:43:19 UTC 2006 
State-Changed-Why:  
Committed with vendor's patch. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104280 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104280: commit references a PR
Date: Thu, 12 Oct 2006 08:43:07 +0000 (UTC)

 rafan       2006-10-12 08:43:01 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/libmikmod      Makefile distinfo 
   Log:
   - Include vendor patch that
     - makes 3.1.x series up-to-date
     - makes it work correctly on amd64
   
   This is not the patch submitted in ports/104280. Submitter confirms the
   vendor patch works well.
   
   PR:             ports/104280
   Submitted by:   Dan Ponte <dcp1990 at neptune.atopia.net>
   Approved by:    portmgr (erwin), David Le Brun <david at dyn-ns.net> (maintainer)
   
   Revision  Changes    Path
   1.43      +5 -1      ports/audio/libmikmod/Makefile
   1.10      +3 -0      ports/audio/libmikmod/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
