summaryrefslogtreecommitdiffstats
path: root/multimedia/ogle
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2002-04-18 03:08:20 +0000
committerlioux <lioux@FreeBSD.org>2002-04-18 03:08:20 +0000
commit7e4d419d08675efb7d4a5cd20dd66d929d29b5e1 (patch)
treebd659b16d782292d2defb921f7b5c34af3ffd6b3 /multimedia/ogle
parentef5c60fd36b9dc86e9d3d869aa0cd9d29f169f9c (diff)
downloadFreeBSD-ports-7e4d419d08675efb7d4a5cd20dd66d929d29b5e1.zip
FreeBSD-ports-7e4d419d08675efb7d4a5cd20dd66d929d29b5e1.tar.gz
o Patch to work with liba52 update to 0.7.3
o Bump PORTREVISION (liba52 had a slight interface update without a library version bump) Submitted by: ogle developers <dvd@dtek.chalmers.se>
Diffstat (limited to 'multimedia/ogle')
-rw-r--r--multimedia/ogle/Makefile1
-rw-r--r--multimedia/ogle/files/patch-ac3:a52_decoder.c63
2 files changed, 64 insertions, 0 deletions
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 9a8f745..af9bc5b 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ogle
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
diff --git a/multimedia/ogle/files/patch-ac3:a52_decoder.c b/multimedia/ogle/files/patch-ac3:a52_decoder.c
new file mode 100644
index 0000000..f1ab072
--- /dev/null
+++ b/multimedia/ogle/files/patch-ac3:a52_decoder.c
@@ -0,0 +1,63 @@
+--- ac3/a52_decoder.c.orig Sun Dec 2 19:37:37 2001
++++ ac3/a52_decoder.c Fri Apr 12 18:25:07 2002
+@@ -46,6 +46,7 @@
+
+ /* A/52 */
+ static ao_instance_t * output = NULL;
++static a52_state_t *state;
+ static sample_t * samples;
+ static int disable_dynrng = 0;
+ static clocktime_t a52_decode_data(uint8_t *start, uint8_t *end);
+@@ -216,15 +217,20 @@
+
+ {
+ uint32_t accel;
+- accel = MM_ACCEL_MLIB;
++ accel = MM_ACCEL_DJBFFT;
+
+ open_output(get_speaker_flags());
+
+- samples = a52_init(accel);
+- if(samples == NULL) {
++ state = a52_init(accel);
++ if(state == NULL) {
+ FATAL("A/52 init failed\n");
+ exit(1);
+ }
++ samples = a52_samples(state);
++ if(samples == NULL) {
++ FATAL("A/52 samples failed\n");
++ exit(1);
++ }
+ }
+
+ if(msgqid != -1) {
+@@ -675,7 +681,6 @@
+ }
+
+ static clocktime_t a52_decode_data(uint8_t *start, uint8_t *end) {
+- static a52_state_t state;
+
+ static uint8_t buf[3840];
+ static uint8_t *bufptr = buf;
+@@ -736,17 +741,16 @@
+
+ flags = speaker_flags;
+ flags |= A52_ADJUST_LEVEL;
+- memset(&state, 0, sizeof(a52_state_t));
+ /* flags (speaker) [in/out] level [in/out] bias [in] */
+- if(a52_frame(&state, buf, &flags, &level, bias)) {
++ if(a52_frame(state, buf, &flags, &level, bias)) {
+ DNOTE("a52_frame() error\n");
+ goto error;
+ }
+
+ if(disable_dynrng)
+- a52_dynrng(&state, NULL, NULL);
++ a52_dynrng(state, NULL, NULL);
+ for(i = 0; i < 6; i++) {
+- if(a52_block(&state, samples)) {
++ if(a52_block(state)) {
+ DNOTE("a52_block() error\n");
+ goto error;
+ }
OpenPOWER on IntegriCloud