From 9369410c4ada578661731d8b9c4dca3b1df36b62 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 29 Dec 2007 16:15:55 +0000
Subject: Just hard-code a default of one thread for DragonFly as the sysconf
 interface doesn't exist. Can be overriden via configure option.

---
 audio/gtkpod/distinfo         |  4 ++--
 audio/gtkpod/patches/patch-bj | 24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'audio')

diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index bc3865386ee..7bae616c179 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/12/26 14:02:35 smb Exp $
+$NetBSD: distinfo,v 1.7 2007/12/29 16:15:55 joerg Exp $
 
 SHA1 (gtkpod-0.99.12.tar.gz) = ab7c03ee1a875fe2bab953d5805a2a4d65fcd669
 RMD160 (gtkpod-0.99.12.tar.gz) = de41d4ab3c907416e88e81fbc79ca1d82411c4c4
@@ -7,4 +7,4 @@ SHA1 (gtkpod-0.99.8_libgpod-0.4.2.diff) = a5090b4597922cc81fc33efd9a3f7e1278b577
 RMD160 (gtkpod-0.99.8_libgpod-0.4.2.diff) = 2e8094b8eba3179279d1b91133df588833e9df3e
 Size (gtkpod-0.99.8_libgpod-0.4.2.diff) = 2580 bytes
 SHA1 (patch-bi) = 664a807d14318fd205a89dacc3084212cc9c6d5e
-SHA1 (patch-bj) = ef43349f0dfd0c956edf8a1491769597e2867221
+SHA1 (patch-bj) = 016caeb2a098692951953ffee5948c574a3e1673
diff --git a/audio/gtkpod/patches/patch-bj b/audio/gtkpod/patches/patch-bj
index 188033ad1c6..9bdf8c3d8ae 100644
--- a/audio/gtkpod/patches/patch-bj
+++ b/audio/gtkpod/patches/patch-bj
@@ -1,8 +1,8 @@
-$NetBSD: patch-bj,v 1.1 2007/12/26 14:02:35 smb Exp $
+$NetBSD: patch-bj,v 1.2 2007/12/29 16:15:55 joerg Exp $
 
---- src/file_convert.c.orig	2007-12-25 00:38:17.000000000 -0500
-+++ src/file_convert.c	2007-12-25 00:38:47.000000000 -0500
-@@ -216,7 +216,7 @@
+--- src/file_convert.c.orig	2007-12-18 04:37:43.000000000 +0000
++++ src/file_convert.c
+@@ -216,7 +216,7 @@ struct _ConvTrack
      gchar *fname_root;      /* filename root of converted file          */
      gchar *fname_extension; /* filename extension of converted file     */
      GPid  pid;              /* PID of child doing the conversion        */
@@ -11,7 +11,19 @@ $NetBSD: patch-bj,v 1.1 2007/12/26 14:02:35 smb Exp $
      Track *track;           /* for reference, don't access inside threads! */
      iTunesDB *itdb;         /* for reference, don't access inside threads! */
      gint  threadnum;        /* number of thread working on this track   */
-@@ -2308,7 +2308,7 @@
+@@ -647,7 +647,11 @@ static void conversion_prefs_changed (Co
+     conv->max_threads_num = prefs_get_int (FILE_CONVERT_MAX_THREADS_NUM);
+     if (conv->max_threads_num == 0)
+     {   /* set to maximum available number of processors */
++#ifdef __DragonFly__
++	conv->max_threads_num = 1;
++#else
+ 	conv->max_threads_num = sysconf (_SC_NPROCESSORS_ONLN);
++#endif
+ 	/* paranoia mode on */
+ 	if (conv->max_threads_num <= 0)
+ 	{
+@@ -2308,7 +2312,7 @@ static gboolean conversion_convert_track
  				  &ctr->pid,    /* child's PID    */
  				  NULL,         /* child's stdin  */
  				  NULL,         /* child's stdout */
@@ -20,7 +32,7 @@ $NetBSD: patch-bj,v 1.1 2007/12/26 14:02:35 smb Exp $
  				  &error);
  
  	    child_pid = ctr->pid;
-@@ -2334,7 +2334,7 @@
+@@ -2334,7 +2338,7 @@ static gboolean conversion_convert_track
  		gint status;
  
  		/* set up i/o channel to main thread */
-- 
cgit v1.2.3