head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.54 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.1.1.0.4 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.8 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2003.03.11.13.33.51; author markd; state dead; branches; next 1.1; 1.1 date 2002.05.31.14.46.49; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.14.46.49; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.14.46.49; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.38.11; author jlam; state Exp; branches; next ; desc @@ 1.2 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: kdemultimedia Started a video framework More consistent internationalisation in many applications. NEW IN KDE: KAudioCreator, a CD ripper and audio encoder frontend. NEW IN KDE: KRec, an audio recorder using aRts. KMediaPlayer interface added to kdelibs to reuse Kaboodle. Noatun: Added option to clear the playlist when running with a file as command line option. Added video thumbnail creator using xine-arts. KMix: Added mute control support. @ text @$NetBSD: patch-aq,v 1.1 2002/05/31 14:46:49 skrll Exp $ --- kscd/libwm/plat_freebsd.c.orig Fri Jan 11 03:19:57 2002 +++ kscd/libwm/plat_freebsd.c @@@@ -34,3 +34,3 @@@@ -#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) +#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) @@@@ -52,3 +52,3 @@@@ -#if defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__OpenBSD__) # define MSF_MINUTES 1 @@@@ -59,2 +59,5 @@@@ # include "/sys/scsi/scsi_cd.h" +#elif defined(__NetBSD__) +#include +#include #else @@@@ -235,7 +238,2 @@@@ dopos: -#ifdef __NetBSD__ - *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 + - scd.what.position.absaddr[MSF_SECONDS] * 75 + - scd.what.position.absaddr[MSF_FRAMES]; -#else *pos = scd.what.position.absaddr.msf.minute * 60 * 75 + @@@@ -243,3 +241,2 @@@@ scd.what.position.absaddr.msf.frame; -#endif *track = scd.what.position.track_number; @@@@ -310,7 +307,2 @@@@ -#ifdef __NetBSD__ - *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 + - toc_buffer.addr[MSF_SECONDS] * 75 + - toc_buffer.addr[MSF_FRAMES]; -#else *startframe = toc_buffer.addr.msf.minute*60*75 + @@@@ -318,3 +310,2 @@@@ toc_buffer.addr.msf.frame; -#endif @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdemultimedia3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-aq was added on branch buildlink2 on 2002-06-23 18:38:11 +0000 @ text @d1 44 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 44 $NetBSD: patch-aq,v 1.1.1.1.2.1 2002/06/23 18:38:11 jlam Exp $ --- kscd/libwm/plat_freebsd.c.orig Fri Jan 11 03:19:57 2002 +++ kscd/libwm/plat_freebsd.c @@@@ -34,3 +34,3 @@@@ -#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) +#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) @@@@ -52,3 +52,3 @@@@ -#if defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__OpenBSD__) # define MSF_MINUTES 1 @@@@ -59,2 +59,5 @@@@ # include "/sys/scsi/scsi_cd.h" +#elif defined(__NetBSD__) +#include +#include #else @@@@ -235,7 +238,2 @@@@ dopos: -#ifdef __NetBSD__ - *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 + - scd.what.position.absaddr[MSF_SECONDS] * 75 + - scd.what.position.absaddr[MSF_FRAMES]; -#else *pos = scd.what.position.absaddr.msf.minute * 60 * 75 + @@@@ -243,3 +241,2 @@@@ scd.what.position.absaddr.msf.frame; -#endif *track = scd.what.position.track_number; @@@@ -310,7 +307,2 @@@@ -#ifdef __NetBSD__ - *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 + - toc_buffer.addr[MSF_SECONDS] * 75 + - toc_buffer.addr[MSF_FRAMES]; -#else *startframe = toc_buffer.addr.msf.minute*60*75 + @@@@ -318,3 +310,2 @@@@ toc_buffer.addr.msf.frame; -#endif @