Bug 184111 - [UPDATE] emulators/desmume to v0.9.9
Summary: [UPDATE] emulators/desmume to v0.9.9
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Alex Kozlov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-20 10:00 UTC by hardy.schumacher
Modified: 2014-01-26 03:30 UTC (History)
0 users

See Also:


Attachments
file.diff (897 bytes, patch)
2013-11-20 10:00 UTC, hardy.schumacher
no flags Details | Diff
update_desmume-0.9.10.txt (2.84 KB, text/plain)
2013-12-14 19:29 UTC, hardy.schumacher
no flags Details
patch.txt (3.45 KB, text/plain; charset=us-ascii)
2014-01-24 04:34 UTC, Alex Kozlov
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description hardy.schumacher 2013-11-20 10:00:00 UTC
Update of port emulators/desmume is available. It contains several improvements and bugfixes.

Fix: Patch attached with submission follows:
How-To-Repeat: n/a
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-20 10:00:07 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-20 10:00:07 UTC
Maintainer of emulators/desmume,

Please note that PR ports/184111 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/184111

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Alex Kozlov 2013-12-10 05:36:23 UTC
Hi, Hardy

It seems that v0.9.10 is out in meantime.
Can you please update the patch?


-- 
Alex
Comment 4 hardy.schumacher 2013-12-14 19:29:20 UTC
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div><br/>
I&#39;ve prepared a patch for v0.9.10.</div>

<div>See attachment.</div>

<div>&nbsp;</div>

<div>Best Regards,</div>

<div>Hardy</div></div></body></html>
Comment 5 unpantsu 2014-01-21 20:20:24 UTC
Patch looks good to me.

On Wed, Nov 20, 2013 at 4:00 AM, Edwin Groothuis <edwin@freebsd.org> wrote:
> Maintainer of emulators/desmume,
>
> Please note that PR ports/184111 has just been submitted.
>
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.
>
> The full text of the PR can be found at:
>     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/184111
>
> --
> Edwin Groothuis via the GNATS Auto Assign Tool
> edwin@FreeBSD.org
Comment 6 Alex Kozlov 2014-01-24 04:34:10 UTC
Hi, Hardy

Please check the attached patch.

P.S. I can also re-assign this port to you, if you want to
maintain it.  


-- 
Alex
Comment 7 Alex Kozlov freebsd_committer freebsd_triage 2014-01-26 03:20:33 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ak

I'll take it.
Comment 8 dfilter service freebsd_committer freebsd_triage 2014-01-26 03:21:03 UTC
Author: ak
Date: Sun Jan 26 03:20:55 2014
New Revision: 341154
URL: http://svnweb.freebsd.org/changeset/ports/341154
QAT: https://qat.redports.org/buildarchive/r341154/

Log:
  - Update to 0.9.10 [1]
  - Fix build with clang [1]
  - Fix ncpu detection [1]
  - Pass maintainership to submitter
  - Convert to USES=dos2unix
  - Support STAGEDIR
  - Remove support for FreeBSD 7.x
  - Remove LICENSE_FILE for standard license
  
  PR:	ports/184111 [1]
  Submitted by:	Hardy Schumacher <hardy.schumacher@gmx.de> (based on) [1]
  Approved by:	llc2w@virginia.edu (old maintainer)

Added:
  head/emulators/desmume/files/
  head/emulators/desmume/files/patch-src_gtk_glx_3Demu.cpp   (contents, props changed)
  head/emulators/desmume/files/patch-src_utils_task.cpp   (contents, props changed)
Modified:
  head/emulators/desmume/Makefile
  head/emulators/desmume/distinfo
  head/emulators/desmume/pkg-plist

Modified: head/emulators/desmume/Makefile
==============================================================================
--- head/emulators/desmume/Makefile	Sun Jan 26 01:06:24 2014	(r341153)
+++ head/emulators/desmume/Makefile	Sun Jan 26 03:20:55 2014	(r341154)
@@ -2,24 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	desmume
-PORTVERSION=	0.9.8
+PORTVERSION=	0.9.10
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
-MAINTAINER=	llc2w@virginia.edu
+MAINTAINER=	hardy.schumacher@gmx.de
 COMMENT=	Nintendo DS emulator
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
+		libSoundTouch.so:${PORTSDIR}/audio/soundtouch
 
 USE_GL=		gl
 USE_SDL=	sdl
 USE_GNOME=	gtk20 libglade2
-USES=		gettext gmake pkgconfig
+USES=		dos2unix gettext gmake pkgconfig
+DOS2UNIX_FILES=	src/utils/task.cpp
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GMSGFMT=msgfmt DATADIRNAME=share
+CONFIGURE_ARGS=	--enable-glade
 
 USE_AUTOTOOLS=	aclocal autoconf
 ACLOCAL_ARGS=
@@ -29,23 +32,6 @@ CFLAGS+=	-I${LOCALBASE}/include -L${LOCA
 		-DHAVE_LIBGDKGLEXT_X11_1_0 -DHAVE_GL_GL_H -DHAVE_GL_GLU_H
 CXXFLAGS+=	${CFLAGS}
 
-MAN1=		desmume-cli.1 \
-		desmume-glade.1 \
-		desmume.1
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-BROKEN=		Does not compile on ia64
-.endif
-
-post-patch:
-# FreeBSD 7.x is missing strnlen(), adjusting this enables a builtin version of strnlen()
-.if ${OSVERSION} < 800000
-	@${REINPLACE_CMD} -e 's|#ifdef __APPLE__|#if 1|g; \
-			/AvailabilityMacros\.h/d' \
-		${WRKSRC}/src/utils/libfat/directory.cpp
-.endif
+BROKEN_ia64=	Does not compile on ia64
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/emulators/desmume/distinfo
==============================================================================
--- head/emulators/desmume/distinfo	Sun Jan 26 01:06:24 2014	(r341153)
+++ head/emulators/desmume/distinfo	Sun Jan 26 03:20:55 2014	(r341154)
@@ -1,2 +1,2 @@
-SHA256 (desmume-0.9.8.tar.gz) = 78363468a2d5efba95de57739a9c81a3757ecd76c2a183ec68336e30d47a5e01
-SIZE (desmume-0.9.8.tar.gz) = 3677290
+SHA256 (desmume-0.9.10.tar.gz) = 8900a7a1fc849fdd33b014748dd97a6cda4c32548b8d2e06511e6ed8d5ba7445
+SIZE (desmume-0.9.10.tar.gz) = 4141586

Added: head/emulators/desmume/files/patch-src_gtk_glx_3Demu.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/desmume/files/patch-src_gtk_glx_3Demu.cpp	Sun Jan 26 03:20:55 2014	(r341154)
@@ -0,0 +1,14 @@
+--- src/gtk/glx_3Demu.cpp.orig	2013-11-28 01:36:53.712615000 +0100
++++ src/gtk/glx_3Demu.cpp	2013-12-14 20:08:01.000000000 +0100
+@@ -41,11 +41,7 @@
+         glXDestroyContext(dpy, ctx);
+ 
+         XCloseDisplay(dpy);
+-
+-        return true;
+     }
+-
+-    return false;
+ }
+ 
+ int init_glx_3Demu(void) 

Added: head/emulators/desmume/files/patch-src_utils_task.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/desmume/files/patch-src_utils_task.cpp	Sun Jan 26 03:20:55 2014	(r341154)
@@ -0,0 +1,22 @@
+--- src/utils/task.cpp.orig	2013-11-28 01:37:27.373159000 +0100
++++ src/utils/task.cpp	2013-12-14 19:49:02.000000000 +0100
+@@ -26,6 +26,7 @@
+ #if defined HOST_LINUX || defined HOST_DARWIN
+ #include <unistd.h>
+ #elif defined HOST_BSD
++#include <iostream>
+ #include <sys/sysctl.h>
+ #endif
+ #endif // HOST_WINDOWS
+@@ -41,9 +42,8 @@
+ 	return sysconf(_SC_NPROCESSORS_ONLN);
+ #elif defined HOST_BSD
+ 	int cores;
+-	const int mib[4] = { CTL_HW, HW_NCPU, 0, 0 };
+-	const size_t len = sizeof(cores);
+-	sysctl(mib, 2, &cores, &len, NULL, 0);
++	size_t len = sizeof(cores);
++	sysctlbyname("hw.ncpu", &cores, &len, NULL, 0);
+ 	return (cores < 1) ? 1 : cores;
+ #else
+ 	return 1;

Modified: head/emulators/desmume/pkg-plist
==============================================================================
--- head/emulators/desmume/pkg-plist	Sun Jan 26 01:06:24 2014	(r341153)
+++ head/emulators/desmume/pkg-plist	Sun Jan 26 03:20:55 2014	(r341154)
@@ -1,6 +1,9 @@
 bin/desmume
 bin/desmume-cli
 bin/desmume-glade
+man/man1/desmume-cli.1.gz
+man/man1/desmume-glade.1.gz
+man/man1/desmume.1.gz
 share/applications/desmume-glade.desktop
 share/applications/desmume.desktop
 %%DATADIR%%/glade/DeSmuME.xpm
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 9 Alex Kozlov freebsd_committer freebsd_triage 2014-01-26 03:21:07 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!