head 1.14; access; symbols pkgsrc-2026Q1:1.14.0.138 pkgsrc-2026Q1-base:1.14 pkgsrc-2025Q4:1.14.0.136 pkgsrc-2025Q4-base:1.14 pkgsrc-2025Q3:1.14.0.134 pkgsrc-2025Q3-base:1.14 pkgsrc-2025Q2:1.14.0.132 pkgsrc-2025Q2-base:1.14 pkgsrc-2025Q1:1.14.0.130 pkgsrc-2025Q1-base:1.14 pkgsrc-2024Q4:1.14.0.128 pkgsrc-2024Q4-base:1.14 pkgsrc-2024Q3:1.14.0.126 pkgsrc-2024Q3-base:1.14 pkgsrc-2024Q2:1.14.0.124 pkgsrc-2024Q2-base:1.14 pkgsrc-2024Q1:1.14.0.122 pkgsrc-2024Q1-base:1.14 pkgsrc-2023Q4:1.14.0.120 pkgsrc-2023Q4-base:1.14 pkgsrc-2023Q3:1.14.0.118 pkgsrc-2023Q3-base:1.14 pkgsrc-2023Q2:1.14.0.116 pkgsrc-2023Q2-base:1.14 pkgsrc-2023Q1:1.14.0.114 pkgsrc-2023Q1-base:1.14 pkgsrc-2022Q4:1.14.0.112 pkgsrc-2022Q4-base:1.14 pkgsrc-2022Q3:1.14.0.110 pkgsrc-2022Q3-base:1.14 pkgsrc-2022Q2:1.14.0.108 pkgsrc-2022Q2-base:1.14 pkgsrc-2022Q1:1.14.0.106 pkgsrc-2022Q1-base:1.14 pkgsrc-2021Q4:1.14.0.104 pkgsrc-2021Q4-base:1.14 pkgsrc-2021Q3:1.14.0.102 pkgsrc-2021Q3-base:1.14 pkgsrc-2021Q2:1.14.0.100 pkgsrc-2021Q2-base:1.14 pkgsrc-2021Q1:1.14.0.98 pkgsrc-2021Q1-base:1.14 pkgsrc-2020Q4:1.14.0.96 pkgsrc-2020Q4-base:1.14 pkgsrc-2020Q3:1.14.0.94 pkgsrc-2020Q3-base:1.14 pkgsrc-2020Q2:1.14.0.90 pkgsrc-2020Q2-base:1.14 pkgsrc-2020Q1:1.14.0.70 pkgsrc-2020Q1-base:1.14 pkgsrc-2019Q4:1.14.0.92 pkgsrc-2019Q4-base:1.14 pkgsrc-2019Q3:1.14.0.88 pkgsrc-2019Q3-base:1.14 pkgsrc-2019Q2:1.14.0.86 pkgsrc-2019Q2-base:1.14 pkgsrc-2019Q1:1.14.0.84 pkgsrc-2019Q1-base:1.14 pkgsrc-2018Q4:1.14.0.82 pkgsrc-2018Q4-base:1.14 pkgsrc-2018Q3:1.14.0.80 pkgsrc-2018Q3-base:1.14 pkgsrc-2018Q2:1.14.0.78 pkgsrc-2018Q2-base:1.14 pkgsrc-2018Q1:1.14.0.76 pkgsrc-2018Q1-base:1.14 pkgsrc-2017Q4:1.14.0.74 pkgsrc-2017Q4-base:1.14 pkgsrc-2017Q3:1.14.0.72 pkgsrc-2017Q3-base:1.14 pkgsrc-2017Q2:1.14.0.68 pkgsrc-2017Q2-base:1.14 pkgsrc-2017Q1:1.14.0.66 pkgsrc-2017Q1-base:1.14 pkgsrc-2016Q4:1.14.0.64 pkgsrc-2016Q4-base:1.14 pkgsrc-2016Q3:1.14.0.62 pkgsrc-2016Q3-base:1.14 pkgsrc-2016Q2:1.14.0.60 pkgsrc-2016Q2-base:1.14 pkgsrc-2016Q1:1.14.0.58 pkgsrc-2016Q1-base:1.14 pkgsrc-2015Q4:1.14.0.56 pkgsrc-2015Q4-base:1.14 pkgsrc-2015Q3:1.14.0.54 pkgsrc-2015Q3-base:1.14 pkgsrc-2015Q2:1.14.0.52 pkgsrc-2015Q2-base:1.14 pkgsrc-2015Q1:1.14.0.50 pkgsrc-2015Q1-base:1.14 pkgsrc-2014Q4:1.14.0.48 pkgsrc-2014Q4-base:1.14 pkgsrc-2014Q3:1.14.0.46 pkgsrc-2014Q3-base:1.14 pkgsrc-2014Q2:1.14.0.44 pkgsrc-2014Q2-base:1.14 pkgsrc-2014Q1:1.14.0.42 pkgsrc-2014Q1-base:1.14 pkgsrc-2013Q4:1.14.0.40 pkgsrc-2013Q4-base:1.14 pkgsrc-2013Q3:1.14.0.38 pkgsrc-2013Q3-base:1.14 pkgsrc-2013Q2:1.14.0.36 pkgsrc-2013Q2-base:1.14 pkgsrc-2013Q1:1.14.0.34 pkgsrc-2013Q1-base:1.14 pkgsrc-2012Q4:1.14.0.32 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q3:1.14.0.30 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.14.0.28 pkgsrc-2012Q2-base:1.14 pkgsrc-2012Q1:1.14.0.26 pkgsrc-2012Q1-base:1.14 pkgsrc-2011Q4:1.14.0.24 pkgsrc-2011Q4-base:1.14 pkgsrc-2011Q3:1.14.0.22 pkgsrc-2011Q3-base:1.14 pkgsrc-2011Q2:1.14.0.20 pkgsrc-2011Q2-base:1.14 pkgsrc-2011Q1:1.14.0.18 pkgsrc-2011Q1-base:1.14 pkgsrc-2010Q4:1.14.0.16 pkgsrc-2010Q4-base:1.14 pkgsrc-2010Q3:1.14.0.14 pkgsrc-2010Q3-base:1.14 pkgsrc-2010Q2:1.14.0.12 pkgsrc-2010Q2-base:1.14 pkgsrc-2010Q1:1.14.0.10 pkgsrc-2010Q1-base:1.14 pkgsrc-2009Q4:1.14.0.8 pkgsrc-2009Q4-base:1.14 pkgsrc-2009Q3:1.14.0.6 pkgsrc-2009Q3-base:1.14 pkgsrc-2009Q2:1.14.0.4 pkgsrc-2009Q2-base:1.14 pkgsrc-2009Q1:1.14.0.2 pkgsrc-2009Q1-base:1.14 pkgsrc-2008Q4:1.11.0.10 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.8 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.6 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.4 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.2 pkgsrc-2008Q1:1.7.0.2 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.6.0.18 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.16 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.14 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.12 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.10 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.8 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.6 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.4 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.2 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.4.0.2 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.6 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.4 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.2 pkgsrc-2004Q3-base:1.1; locks; strict; comment @# @; 1.14 date 2009.02.23.13.24.31; author wiz; state Exp; branches; next 1.13; 1.13 date 2009.01.29.17.53.49; author abs; state Exp; branches; next 1.12; 1.12 date 2009.01.24.12.29.51; author tonio; state Exp; branches; next 1.11; 1.11 date 2008.06.21.11.45.56; author drochner; state Exp; branches; next 1.10; 1.10 date 2008.05.25.14.34.13; author tonio; state Exp; branches; next 1.9; 1.9 date 2008.05.24.07.24.59; author tonio; state Exp; branches; next 1.8; 1.8 date 2008.05.21.19.21.33; author tonio; state Exp; branches; next 1.7; 1.7 date 2008.02.20.09.56.44; author xtraeme; state Exp; branches; next 1.6; 1.6 date 2005.12.06.17.47.56; author joerg; state Exp; branches; next 1.5; 1.5 date 2005.10.29.01.36.42; author grant; state Exp; branches; next 1.4; 1.4 date 2005.09.06.08.10.59; author abs; state Exp; branches; next 1.3; 1.3 date 2005.07.13.13.16.27; author wiz; state Exp; branches; next 1.2; 1.2 date 2005.06.07.23.38.34; author hubertf; state Exp; branches; next 1.1; 1.1 date 2004.06.26.18.00.21; author grant; state Exp; branches; next ; desc @@ 1.14 log @Improve patch for DragonFlyBSD -- fixes compilation. No change for other platforms, so no PKGREVISION bump. Patch from Steve O'Hara-Smith on pkgsrc-users. @ text @$NetBSD$ --- mpeg3io.c.orig 2008-07-05 00:47:42 +0000 +++ mpeg3io.c @@@@ -1,10 +1,43 @@@@ #include "mpeg3private.h" #include "mpeg3protos.h" -#include #include #include #include + +#if defined(__NetBSD__) + +# include +# define fopen64 fopen +# define fseeko64 fseek +# define stat64 stat +# if __NetBSD_Version__ >= 299000900 /* 2.99.9 */ +# define statfs statvfs +# endif + +#elif defined(__DragonFly__) + +# include +# include +# include +# define fopen64 fopen +# define fseeko64 fseek +# define stat64 stat + +#elif defined(__APPLE__) && defined(__MACH__) + +# include +# include +# include +# include +# if !defined(__DARWIN_64_BIT_INO_T /* MacOSX < 10.5 */) +# define stat64 stat +# endif +# define fopen64 fopen +# define fseeko64 fseek + +#endif + #include mpeg3_fs_t* mpeg3_new_fs(char *path) @@@@ -215,16 +248,26 @@@@ void mpeg3io_complete_path(char *complet int mpeg3io_device(char *path, char *device) { +#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) + struct statfs file_st; + + if (statfs(path, &file_st) < 0) +#else + struct stat64 file_st, device_st; struct mntent *mnt; FILE *fp; if(stat64(path, &file_st) < 0) +#endif { perror("mpeg3io_device"); return 1; } +#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) + strncpy(device, file_st.f_mntfromname, MPEG3_STRLEN); +#else fp = setmntent(MOUNTED, "r"); while(fp && (mnt = getmntent(fp))) { @@@@ -236,6 +279,7 @@@@ int mpeg3io_device(char *path, char *dev } } endmntent(fp); +#endif return 0; } @ 1.13 log @Updated multimedia/libmpeg3 to 1.8 1.8 - Better table of contents generation & handling of ID3 tags. pkgsrc changes: - Fix broken build on NetBSD by reworking the mares nest of non Linux #ifdefs in mpeg3io.c - build was broken by a previous __DragonFly__ or __APPLE_ build fix - Add new patch for 1.8 to avoid Linux DVD ioctls @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.12 2009/01/24 12:29:51 tonio Exp $ d3 1 a3 1 --- mpeg3io.c.orig 2008-07-05 01:47:42.000000000 +0100 d5 1 a5 1 @@@@ -1,10 +1,42 @@@@ d31 1 d50 1 a50 1 @@@@ -215,16 +247,26 @@@@ void mpeg3io_complete_path(char *complet d77 1 a77 1 @@@@ -236,6 +278,7 @@@@ int mpeg3io_device(char *path, char *dev @ 1.12 log @Fixes the build under Darwin x86. This should also fixes build on MacOSX 10.5.2 PPC Should Fix PR pkg/38721 @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- mpeg3io.c.orig 2005-05-01 07:57:56.000000000 +0200 d5 1 a5 1 @@@@ -1,11 +1,34 @@@@ a12 1 -#include d14 12 a25 1 +#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) d28 3 d32 8 a39 12 +# if defined(__APPLE__) && defined(__MACH__) +#include +# endif +# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) +# define fopen64 fopen +# define fseeko64 fseek +# if (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_64_BIT_INO_T) /* MacOSX < 10.5 */) +# define stat64 stat +# endif +# endif +# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */ +# define statfs statvfs d41 2 a43 5 +# include +# include +#else +# include +# include d45 2 d49 1 a49 2 { @@@@ -215,16 +238,26 @@@@ void mpeg3io_complete_path(char *complet d76 1 a76 1 @@@@ -236,6 +269,7 @@@@ int mpeg3io_device(char *path, char *dev @ 1.11 log @make this build on DragonFly, from Hasso Tepper per PR pkg/38997 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.10 2008/05/25 14:34:13 tonio Exp $ d4 2 a5 2 +++ mpeg3io.c 2008-02-19 19:25:09.000000000 +0100 @@@@ -1,11 +1,32 @@@@ d22 1 a22 1 +# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_64_BIT_INO_T) /* MacOSX < 10.5 */) d25 1 d27 1 d42 1 a42 1 @@@@ -215,16 +231,26 @@@@ d69 1 a69 1 @@@@ -236,6 +262,7 @@@@ @ 1.10 log @Yet another try to fix PR pkg/38733 Use the __DARWIN_64_BIT_INO_T from sys/cdefs.h on darwin @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.9 2008/05/24 07:24:59 tonio Exp $ d22 1 a22 1 +# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_64_BIT_INO_T) /* MacOSX < 10.5 */) @ 1.9 log @Fixing build for MacOSX 10.5, using __DARWIN_STRUCT_STAT64 to detect if stat64 is available. This should fix PR pkg/38721 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.8 2008/05/21 19:21:33 tonio Exp $ d5 1 a5 1 @@@@ -1,11 +1,29 @@@@ d19 4 a22 1 +# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_STRUCT_STAT64) /* MacOSX < 10.5 */) @ 1.8 log @Fix build for Darwin - use the same work around for mntent.h as for NetBSD and DragonFly - deactivate oss output for Darwin This fixes PR pkg/38721 @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.7 2008/02/20 09:56:44 xtraeme Exp $ d19 1 a19 1 +# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || (defined(__APPLE__) && defined(__MACH__) /* MacOSX */) @ 1.7 log @Update to 1.7: Frames are cached when reading the first frame after a seek. This allows faster reverse playback. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -1,11 +1,27 @@@@ d15 1 a15 1 +#if defined(__NetBSD__) || defined(__DragonFly__) d19 1 a19 1 +# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */ d23 2 d41 1 a41 1 +#if defined(__NetBSD__) || defined(__DragonFly__) d58 1 a58 1 +#if defined(__NetBSD__) || defined(__DragonFly__) @ 1.6 log @Use statfs on DragonFly as well. To make the code more readable, restore natural order of checking for features instead of the reverse. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.5 2005/10/29 01:36:42 grant Exp $ d3 3 a5 3 --- mpeg3io.c.orig 2001-05-20 13:05:26.000000000 +1000 +++ mpeg3io.c @@@@ -1,8 +1,21 @@@@ d10 3 d14 1 d20 3 a31 3 + #include #include d33 3 a35 1 @@@@ -88,16 +101,25 @@@@ int mpeg3io_read_data(unsigned char *buf d44 2 a45 1 struct stat file_st, device_st; d49 1 a49 1 if(stat(path, &file_st) < 0) d62 1 a62 1 @@@@ -109,6 +131,7 @@@@ int mpeg3io_device(char *path, char *dev @ 1.5 log @sprinkle some #ifdef and simplify, instead of unconditionally adding stuff for NetBSD that breaks this on all other platforms. @ text @d1 1 a1 1 $NetBSD$ d11 1 a11 4 +#ifndef __NetBSD__ +# include +# include +#else d15 1 a15 1 +# if __NetBSD_Version__ >= 299000900 /* 2.99.9 */ d21 3 d29 1 a29 1 @@@@ -88,16 +101,23 @@@@ int mpeg3io_read_data(unsigned char *buf d33 5 a37 1 +#ifndef __NetBSD__ a42 4 +#else + struct statfs file_st; + + if (statfs(path, &file_st) < 0) d49 3 a51 1 +#ifndef __NetBSD__ d55 1 a55 1 @@@@ -109,6 +129,9 @@@@ int mpeg3io_device(char *path, char *dev a58 2 +#else + strncpy(device, file_st.f_mntfromname, MPEG3_STRLEN); @ 1.4 log @Fix NetBSD statvfs check to be >= 299000900 not >= 200040000 No pkgrevision bumps needed. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2005/07/13 13:16:27 wiz Exp $ d3 1 a3 1 --- mpeg3io.c.orig 2001-05-20 05:05:26.000000000 +0200 d5 1 a5 1 @@@@ -1,11 +1,20 @@@@ d11 8 a18 7 +#include +#include #include #include +#ifdef __NetBSD__ +# if __NetBSD_Version__ >= 299000900 /* 2.99.9 */ d21 3 d26 4 a29 7 +#include +#include + mpeg3_fs_t* mpeg3_new_fs(char *path) { mpeg3_fs_t *fs = calloc(1, sizeof(mpeg3_fs_t)); @@@@ -88,27 +97,15 @@@@ int mpeg3io_read_data(unsigned char *buf d33 7 a39 3 - struct stat file_st, device_st; - struct mntent *mnt; - FILE *fp; d41 3 a43 3 - if(stat(path, &file_st) < 0) + if(statfs(path, &file_st) < 0) d49 9 a57 11 - fp = setmntent(MOUNTED, "r"); - while(fp && (mnt = getmntent(fp))) - { - if(stat(mnt->mnt_fsname, &device_st) < 0) continue; - if(device_st.st_rdev == file_st.st_dev) - { - strncpy(device, mnt->mnt_fsname, MPEG3_STRLEN); - break; - } - } - endmntent(fp); d59 1 @ 1.3 log @Add RCS Id. @ text @d1 1 a1 1 $NetBSD$ d17 1 a17 1 +# if __NetBSD_Version__ >= 200040000 /* 2.0D */ @ 1.2 log @Bump to libmpeg3-1.3nb5: fix building on MacOS X: * patch-ac: define bswap_16 and bswap_32 as appropriate for NetBSD, Linux and MacOS X * patch-ae: Pull in headers for 'struct stat'. Hello Linux! @ text @d1 2 d4 1 a4 1 +++ mpeg3io.c 2005-06-08 00:54:51.000000000 +0200 d28 1 a28 1 @@@@ -88,27 +97,15 @@@@ @ 1.1 log @move libmpeg3 to multimedia/ @ text @d1 3 a3 5 $NetBSD: patch-ae,v 1.2 2004/05/04 13:50:57 mrg Exp $ --- mpeg3io.c.orig 2001-05-20 13:05:26.000000000 +1000 +++ mpeg3io.c 2004-05-04 23:48:36.000000000 +1000 @@@@ -1,11 +1,17 @@@@ d20 3 d26 1 a26 1 @@@@ -88,27 +94,15 @@@@ @