cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.8.3

Browse Source 
- openbsd native audio, mostly thanks to Bjorn.
- slightly better navigation code.
This commit is contained in:
espie 2002-06-15 23:09:34 +00:00
parent 70ec7dbb4e
commit baf199b2b6
13 changed files with 66 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/ogle/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2002/05/19 00:27:06 espie Exp $
# $OpenBSD: Makefile,v 1.11 2002/06/15 23:09:34 espie Exp $
ONLY_FOR_ARCHS= alpha i386 powerpc sparc64
@ -6,7 +6,7 @@ CATEGORIES= x11
NEED_VERSION= 1.500
COMMENT= "DVD player"
DISTNAME= ogle-0.8.2
DISTNAME= ogle-0.8.3
HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/
# Authors can be reached at dvd@dtek.chalmers.se
MASTER_SITES= ${HOMEPAGE}dist/
@ -30,7 +30,7 @@ LIB_DEPENDS= dvdread::devel/libdvdread \
FLAVORS= altivec
FLAVOR?=
CONFIGURE_ARGS=--disable-oss --enable-sunaudio
CONFIGURE_ARGS=--disable-oss --disable-sunaudio --enable-obsdaudio
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= ::devel/binutils/stable

6
x11/ogle/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ogle-0.8.2.tar.gz) = 0b2c949e372b7e79f9106d99c5d2ba45
RMD160 (ogle-0.8.2.tar.gz) = ea68895b4d659a9380df76a427a7a633d7c7befc
SHA1 (ogle-0.8.2.tar.gz) = 84f3505eaa8f6d002f663bfe036c533a4a83f714
MD5 (ogle-0.8.3.tar.gz) = b2ada7bc14c2ed6ccc154493e186694f
RMD160 (ogle-0.8.3.tar.gz) = 3d86e31f17e306d876086cbf14f1870a08ed7ff2
SHA1 (ogle-0.8.3.tar.gz) = 80517f375b13b637ee15069368ff703b5d1b7e52

60
x11/ogle/patches/patch-ac3_a52_decoder_c
View File

@ -1,60 +0,0 @@
$OpenBSD: patch-ac3_a52_decoder_c,v 1.1 2002/03/29 14:46:01 espie Exp $
--- ac3/a52_decoder.c.orig Fri Mar 29 15:14:16 2002
+++ ac3/a52_decoder.c Fri Mar 29 15:19:06 2002
@@ -51,6 +51,7 @@ static int disable_dynrng = 0;
static clocktime_t a52_decode_data(uint8_t *start, uint8_t *end);
+static a52_state_t *state;
static int get_q();
static int attach_ctrl_shm(int shmid);
@@ -216,15 +217,16 @@ int main(int argc, char *argv[])
{
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(msgqid != -1) {
@@ -675,7 +677,6 @@ int get_q()
}
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 +737,16 @@ static clocktime_t a52_decode_data(uint8
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;
}

48
x11/ogle/patches/patch-configure
View File

@ -1,43 +1,25 @@
$OpenBSD: patch-configure,v 1.3 2002/05/19 00:27:06 espie Exp $
--- configure.orig Fri Dec 7 18:45:21 2001
+++ configure Sun May 19 01:18:35 2002
@@ -2419,7 +2419,7 @@ CCDEPMODE="depmode=$am_cv_CC_dependencie
# By default we simply use the C compiler to build assembly code.
-: ${AS='$(CC)'}
+: ${AS='$CC'}
# Set ASFLAGS if not already set.
: ${ASFLAGS='$(CFLAGS)'}
@@ -15547,6 +15547,7 @@ cat >conftest.$ac_ext <<_ACEOF
#line 15547 "configure"
$OpenBSD: patch-configure,v 1.4 2002/06/15 23:09:34 espie Exp $
--- configure.orig Wed Jun 12 00:11:32 2002
+++ configure Sun Jun 16 00:51:03 2002
@@ -6255,6 +6255,7 @@ else
cat > conftest.$ac_ext <<EOF
#line 6257 "configure"
#include "confdefs.h"
$ac_includes_default
+#include <X11/Xlib.h>
#include <X11/extensions/XShm.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -17296,7 +17297,7 @@ if test "${enable_sunaudio+set}" = set;
fi;
if test x"$enable_sunaudio" != x"no"; then
case "$host" in
- *-sun-solaris*|*-netbsd*)
+ *-sun-solaris*|*-netbsd*|*-openbsd*)
cat >>confdefs.h <<\_ACEOF
#define LIBAO_SUNAUDIO
@@ -17622,6 +17623,7 @@ cat >conftest.$ac_ext <<_ACEOF
#line 17622 "configure"
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -7795,6 +7796,7 @@ else
cat > conftest.$ac_ext <<EOF
#line 7797 "configure"
#include "confdefs.h"
$ac_includes_default
+#include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -17873,8 +17875,11 @@ _ACEOF
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -8075,8 +8077,11 @@ EOF
powerpc|ppc)
if test x"$GCC" = x"yes"; then
if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops"
- XCFLAGS="-Wa,-m7400"
- USE_ALTIVEC=yes

82
x11/ogle/patches/patch-libao_audio_out_solaris_c
View File

@ -1,82 +0,0 @@
$OpenBSD: patch-libao_audio_out_solaris_c,v 1.1 2002/05/28 14:32:31 espie Exp $
--- libao/audio_out_solaris.c.orig Mon Oct 22 03:23:49 2001
+++ libao/audio_out_solaris.c Tue May 28 16:28:30 2002
@@ -71,6 +71,37 @@ static inline int16_t convert (int32_t i
return i - 0x43c00000;
}
+unsigned char tr[235] =
+{
+ 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+ 153, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 216, 217, 218,
+ 219, 220, 221, 222, 223, 224, 225, 226, 227, 229, 230, 231, 232, 233, 234,
+ 235, 236, 237, 238, 239, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250,
+ 251, 253, 254, 255
+};
+
+static inline int float_to_int48_44 (float * _f, int16_t * s16, int flags)
+{
+ int i;
+ int32_t * f = (int32_t *) _f;
+
+ for (i = 0; i < 235; i++) {
+ s16[2*i] = convert (f[tr[i]]);
+ s16[2*i+1] = convert (f[tr[i]+256]);
+ }
+ return i;
+}
+
static inline void float_to_int (float * _f, int16_t * s16, int flags)
{
int i;
@@ -97,6 +128,7 @@ int solaris_play (ao_instance_t * _insta
{
solaris_instance_t * instance = (solaris_instance_t *) _instance;
int16_t int16_samples[256*2];
+ static int downsample = 0;
#ifdef LIBA52_DOUBLE
float samples[256 * 2];
@@ -127,6 +159,15 @@ int solaris_play (ao_instance_t * _insta
perror ("Writing audio config block");
return 1;
}
+ if (info.play.sample_rate != instance->sample_rate &&
+ instance->sample_rate == 48000) {
+ info.play.sample_rate = 44100;
+ if (ioctl (instance->fd, AUDIO_SETINFO, &info) < 0) {
+ perror ("Writing audio config block");
+ return 1;
+ }
+ downsample = 1;
+ }
if ((info.play.sample_rate != instance->sample_rate) ||
(info.play.precision != 16) || (info.play.channels != 2)) {
@@ -149,8 +190,14 @@ int solaris_play (ao_instance_t * _insta
} else if (flags != instance->flags)
return 1;
- float_to_int (samples, int16_samples, flags);
- write (instance->fd, int16_samples, 256 * sizeof (int16_t) * 2);
+ if (downsample) {
+ int num;
+ num = float_to_int48_44(samples, int16_samples, flags);
+ write(instance->fd, int16_samples, num * sizeof (int16_t) * 2);
+ } else {
+ float_to_int (samples, int16_samples, flags);
+ write (instance->fd, int16_samples, 256 * sizeof (int16_t) * 2);
+ }
return 0;
}

13
x11/ogle/patches/patch-libogleao_obsd_audio_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libogleao_obsd_audio_c,v 1.1 2002/06/15 23:09:34 espie Exp $
--- libogleao/obsd_audio.c.orig Sun Jun 16 00:59:20 2002
+++ libogleao/obsd_audio.c Sun Jun 16 00:59:43 2002
@@ -158,7 +158,9 @@ int obsd_odelay(ogle_ao_instance_t *_ins
odelay = instance->samples_written - info.play.samples;
*/
odelay = seek / instance->sample_frame_size;
+#if 0
fprintf(stderr, "odelay: %d\n", odelay);
+#endif
*samples_return = odelay;

14
x11/ogle/patches/patch-ltmain_sh
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2002/01/08 11:05:53 espie Exp $
--- ltmain.sh.orig Tue Dec 11 10:38:20 2001
+++ ltmain.sh Tue Dec 11 10:38:29 2001
@@ -2075,7 +2075,7 @@ EOF
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
$OpenBSD: patch-ltmain_sh,v 1.2 2002/06/15 23:09:34 espie Exp $
--- ltmain.sh.orig Sun Nov 4 19:16:20 2001
+++ ltmain.sh Sun Jun 16 00:48:18 2002
@@ -1716,7 +1716,7 @@ compiler."
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
+ need_relink=no
fi
# This is a shared library
if test "$linkmode" = lib &&
if test -n "$old_archive_from_expsyms_cmds"; then

20
x11/ogle/patches/patch-mpeg2_video_Makefile_in
View File

@ -1,11 +1,11 @@
--- mpeg2_video/Makefile.in.orig Fri Dec 7 18:45:26 2001
+++ mpeg2_video/Makefile.in Mon Dec 10 01:53:49 2001
@@ -548,7 +548,7 @@ distclean-depend:
.c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@ PATH=${GAS_DIR}:$$PATH $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
--- mpeg2_video/Makefile.in.orig Wed Jun 12 00:13:36 2002
+++ mpeg2_video/Makefile.in Sun Jun 16 00:51:56 2002
@@ -466,7 +466,7 @@ uninstall-pkglibPROGRAMS:
done
.c.obj:
.c.o:
- $(COMPILE) -c $<
+ PATH=${GAS_DIR}:$$PATH $(COMPILE) -c $<
# FIXME: We should only use cygpath when building on Windows,
# and only if it is available.

12
x11/ogle/patches/patch-mpeg2_video_screenshot_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mpeg2_video_screenshot_c,v 1.1 2002/01/08 11:05:53 espie Exp $
--- mpeg2_video/screenshot.c.orig Mon Dec 10 19:20:37 2001
+++ mpeg2_video/screenshot.c Mon Dec 10 19:20:46 2001
@@ -194,7 +194,7 @@ void screenshot_yuv_jpg(yuv_image_t *yuv
static char *new_file(void) {
char *pre = "shot";
- int i = 0;
+ static int i = 0;
int fd;
static char full_name[20];

10
x11/ogle/patches/patch-mpeg2_video_spu_mixer_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mpeg2_video_spu_mixer_c,v 1.1 2002/01/08 11:05:53 espie Exp $
--- mpeg2_video/spu_mixer.c.orig Sun Dec 2 22:38:00 2001
+++ mpeg2_video/spu_mixer.c Thu Dec 13 00:32:25 2001
$OpenBSD: patch-mpeg2_video_spu_mixer_c,v 1.2 2002/06/15 23:09:34 espie Exp $
--- mpeg2_video/spu_mixer.c.orig Sun May 26 21:32:19 2002
+++ mpeg2_video/spu_mixer.c Sun Jun 16 00:48:18 2002
@@ -43,6 +43,8 @@
@ -10,7 +10,7 @@ $OpenBSD: patch-mpeg2_video_spu_mixer_c,v 1.1 2002/01/08 11:05:53 espie Exp $
#ifdef DEBUG
#define GETBYTES(a,b) getbytes(a,b)
@@ -912,6 +914,7 @@ static void decode_display_data(spu_t *s
@@ -910,6 +912,7 @@ static void decode_display_data(spu_t *s
y = 0;
DPRINTF(5, "vlc decoding\n");
@ -18,7 +18,7 @@ $OpenBSD: patch-mpeg2_video_spu_mixer_c,v 1.1 2002/01/08 11:05:53 espie Exp $
while((fieldoffset[1] < spu_info->DCSQT_offset) && (y < spu_info->height)) {
unsigned int vlc;
unsigned int length;
@@ -987,7 +990,7 @@ static void decode_display_data(spu_t *s
@@ -985,7 +988,7 @@ static void decode_display_data(spu_t *s
unsigned int line_y;
char *addr;

12
x11/ogle/patches/patch-mpeg2_video_video_output_x11_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mpeg2_video_video_output_x11_c,v 1.4 2002/05/26 19:03:43 espie Exp $
--- mpeg2_video/video_output_x11.c.orig Sun Dec 2 22:38:00 2001
+++ mpeg2_video/video_output_x11.c Sun May 26 18:54:01 2002
@@ -1135,6 +1135,12 @@ void check_x_events(yuv_image_t *current
$OpenBSD: patch-mpeg2_video_video_output_x11_c,v 1.5 2002/06/15 23:09:34 espie Exp $
--- mpeg2_video/video_output_x11.c.orig Thu Jun 6 18:45:02 2002
+++ mpeg2_video/video_output_x11.c Sun Jun 16 00:48:18 2002
@@ -1218,6 +1218,12 @@ void check_x_events(yuv_image_t *current
if(keysym == XK_I) {
screenshot_spu = 1;
}
@ -14,7 +14,7 @@ $OpenBSD: patch-mpeg2_video_video_output_x11_c,v 1.4 2002/05/26 19:03:43 espie E
}
break;
case ButtonPress:
@@ -1699,6 +1705,8 @@ static void draw_win_x11(window_info *dw
@@ -1764,6 +1770,8 @@ static void draw_win_x11(window_info *dw
window.video_area.height);
XSync(mydisplay, False);
}
@ -23,7 +23,7 @@ $OpenBSD: patch-mpeg2_video_video_output_x11_c,v 1.4 2002/05/26 19:03:43 espie E
}
@@ -1772,6 +1780,8 @@ static void draw_win_xv(window_info *dwi
@@ -1847,6 +1855,8 @@ static void draw_win_xv(window_info *dwi
It waits for an XShmCompletionEvent */
XIfEvent(mydisplay, &ev, predicate, NULL);
}

4
x11/ogle/pkg/PFRAG.shared
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2002/01/08 11:05:53 espie Exp $
lib/ogle/libdvdcontrol.so.5.0
@comment $OpenBSD: PFRAG.shared,v 1.5 2002/06/15 23:09:34 espie Exp $
lib/ogle/libdvdcontrol.so.6.0
@exec ln -s %D/%F %D/lib # link libdvdcontrol
@unexec rm %D/lib/%f # unlink libdvdcontrol
lib/ogle/libmsgevents.so.4.0

4
x11/ogle/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2002/01/08 11:05:53 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2002/06/15 23:09:34 espie Exp $
bin/ifo_dump
bin/ogle
include/ogle/dvd.h
@ -9,8 +9,8 @@ lib/ogle/libdvdcontrol.a
lib/ogle/libdvdcontrol.la
lib/ogle/libmsgevents.a
lib/ogle/libmsgevents.la
lib/ogle/ogle_a52
lib/ogle/ogle_ac3_p
lib/ogle/ogle_audio
lib/ogle/ogle_cli
lib/ogle/ogle_ctrl
lib/ogle/ogle_mpeg_ps