head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.138 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.136 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.134 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.132 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.130 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.128 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.126 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.124 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.122 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.120 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.118 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.116 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.114 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.112 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.110 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.108 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.106 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.104 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.102 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.100 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.98 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.96 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.94 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.90 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.70 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.92 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.88 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.86 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.84 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.82 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.80 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.78 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.76 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.74 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.72 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.68 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.66 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.64 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.62 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.60 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.58 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.56 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.54 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.52 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.50 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.48 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.46 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.44 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.42 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.40 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.38 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.36 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.34 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.32 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.30 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.28 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.26 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.24 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.22 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.20 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.18 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.16 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.14 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.12 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.10 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.8 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.6 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.4 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.2 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.3.0.10 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.8 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.6 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.4 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.2 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.2.0.18 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.16 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.14 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.12 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.10 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.8 pkgsrc-2005Q2-base:1.1 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.4 date 2009.01.29.17.53.49; author abs; state Exp; branches; next 1.3; 1.3 date 2008.02.20.09.56.44; author xtraeme; state dead; branches; next 1.2; 1.2 date 2005.10.29.01.43.18; author grant; state Exp; branches; next 1.1; 1.1 date 2004.06.26.18.00.21; author grant; state Exp; branches; next ; desc @@ 1.4 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 @$NetBSD$ --- mpeg3css.c.orig 2007-01-09 07:09:52.000000000 +0000 +++ mpeg3css.c @@@@ -41,7 +41,9 @@@@ #include #include // Must unlink /usr/include directories from the kernel source for this to work. -#include +#ifdef linux +# include +#endif #include #include #include @@@@ -572,6 +574,7 @@@@ static void crypt_bus_key(mpeg3_css_t *c css_engine(perm_varient[varient], scratch, key); } +#ifdef linux static int get_asf(mpeg3_css_t *css) { dvd_authinfo ai; @@@@ -588,6 +591,7 @@@@ static int get_asf(mpeg3_css_t *css) return 0; } +#endif /* linux */ static int authenticate_drive(mpeg3_css_t *css, const unsigned char *key) { @@@@ -611,6 +615,7 @@@@ static int authenticate_drive(mpeg3_css_ return 0; } +#ifdef linux /* Simulation of a non-CSS compliant host (i.e. the authentication fails, * but idea is here for a real CSS compliant authentication scheme). */ static int hostauth(mpeg3_css_t *css, dvd_authinfo *ai) @@@@ -801,6 +806,7 @@@@ static int validate(mpeg3_css_t *css, in return 0; } +#endif /* linux */ static int validate_path(mpeg3_css_t *css, int do_title) { @@@@ -831,7 +837,9 @@@@ static int validate_path(mpeg3_css_t *cs if(!result) result = (css->fd = open(css->device_path, O_RDONLY | O_NONBLOCK)) < 0; //printf("validate_path 2 %d\n", result); +#ifdef linux if(!result) result = validate(css, lba, do_title); +#endif /* linux */ //printf("validate_path 3 %d\n", result); /* Definitely encrypted if we got here. */ @ 1.3 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: patch-ab,v 1.2 2005/10/29 01:43:18 grant Exp $ d3 1 a3 1 --- mpeg3css.c.orig 2001-05-20 13:05:26.000000000 +1000 d5 4 a8 4 @@@@ -45,7 +45,11 @@@@ #include #include #include d10 1 a10 1 +#ifdef __linux__ a11 2 +#else +# include d13 6 d20 38 a57 2 #ifndef FIBMAP #define FIBMAP _IO(0x00,1) /* bmap access */ @ 1.2 log @remove more breakage introduced by NetBSD fixes... @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @move libmpeg3 to multimedia/ @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $ d3 3 a5 3 --- mpeg3css.c.orig Tue Jul 31 17:16:17 2001 +++ mpeg3css.c Tue Jul 31 17:16:44 2001 @@@@ -45,7 +45,7 @@@@ d10 5 a14 1 +#include @