head	1.3;
access;
symbols
	pkgsrc-2017Q1:1.2.0.38
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.36
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.34
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.32
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.30
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.28
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.26
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.24
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.22
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.20
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.18
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.16
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.14
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.12
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.10
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.6
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.4
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.2
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.1.0.4
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2017.04.22.17.27.34;	author taca;	state dead;
branches;
next	1.2;
commitid	Fv9yPZ4OebOSpyOz;

1.2
date	2012.07.03.18.21.48;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2012.04.07.23.20.42;	author dholland;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2012.04.07.23.20.42;	author sbd;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2012.04.08.10.53.25;	author sbd;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove amarok-kde3 package which is not maintained any more and depends
on ruby18.
@
text
@$NetBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.2 2012/07/03 18:21:48 joerg Exp $

Fix build with newer xine-lib.

--- amarok/src/engine/xine/xine-engine.cpp.orig	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/engine/xine/xine-engine.cpp
@@@@ -1131,7 +1131,7 @@@@ bool XineEngine::metaDataForUrl(const KU
 
 bool XineEngine::getAudioCDContents(const QString &device, KURL::List &urls)
 {
-    char **xine_urls = NULL;
+    const char *const *xine_urls = NULL;
     int num;
     int i = 0;
 
@@@@ -1244,7 +1244,7 @@@@ Fader::run()
         elapsedUs += stepSizeUs;
 
         // get volume (amarok main * equalizer preamp)
-        float vol = Engine::Base::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp;
+        float vol = XineEngine::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp;
 
         // compute the mix factor as the percentage of time spent since fade begun
         float mix = (elapsedUs / 1000.0) / (float)m_fadeLength;
@


1.2
log
@Fix linkage with GCC 4.6+ and Clang. Fix look up issues.
@
text
@d1 1
a1 1
$NetBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.1 2012/04/07 23:20:42 dholland Exp $
@


1.1
log
@Patch build with new xine.
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
--- amarok/src/engine/xine/xine-engine.cpp~	2008-08-13 21:21:51.000000000 +0000
d16 9
@


1.1.2.1
log
@file patch-amarok_src_engine_xine_xine-engine_cpp was added on branch pkgsrc-2012Q1 on 2012-04-08 10:53:25 +0000
@
text
@d1 15
@


1.1.2.2
log
@Pullup ticket #3713 - requested by dholland
audio/amarok-kde3 build fix.

Revisions pulled up:
- audio/amarok-kde3/distinfo                                    1.3
- audio/amarok-kde3/patches/patch-amarok_src_engine_xine_xine-engine_cpp 1.1

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sat Apr  7 23:20:42 UTC 2012

   Modified Files:
   	pkgsrc/audio/amarok-kde3: distinfo
   Added Files:
   	pkgsrc/audio/amarok-kde3/patches:
   	    patch-amarok_src_engine_xine_xine-engine_cpp

   Log Message:
   Patch build with new xine.
@
text
@a0 15
$NetBSD$

Fix build with newer xine-lib.

--- amarok/src/engine/xine/xine-engine.cpp~	2008-08-13 21:21:51.000000000 +0000
+++ amarok/src/engine/xine/xine-engine.cpp
@@@@ -1131,7 +1131,7 @@@@ bool XineEngine::metaDataForUrl(const KU
 
 bool XineEngine::getAudioCDContents(const QString &device, KURL::List &urls)
 {
-    char **xine_urls = NULL;
+    const char *const *xine_urls = NULL;
     int num;
     int i = 0;
 
@