[Frugalware-git] frugalware-current: ogle-0.9.2-7-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a1d0120808d32f83180eb4d36a843e3c0598c24f
commit a1d0120808d32f83180eb4d36a843e3c0598c24f
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Jun 13 00:22:46 2011 +0200
ogle-0.9.2-7-i686
- bin, unmaintained since years
- it was the first dvd player supporting menus, but that's now a common
feature
diff --git a/source/xapps-extra/ogle/FrugalBuild
b/source/xapps-extra/ogle/FrugalBuild
deleted file mode 100644
index 6e05742..000
--- a/source/xapps-extra/ogle/FrugalBuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: Miklos Vajna vmik...@frugalware.org
-
-pkgname=ogle
-pkgver=0.9.2
-pkgrel=7
-pkgdesc=The first opensource DVD player to support DVD menus.
-url=http://www.dtek.chalmers.se/groups/dvd/;
-depends=('a52dec' 'libxv' 'libsm' 'libxinerama' 'alsa-lib' 'libxxf86vm' \
- 'libjpeg=8b' 'libdvdread' 'libxml2=2.7.8' 'libmad')
-groups=('xapps-extra')
-archs=('i686' 'x86_64')
-up2date=lynx -dump $url/dist/|grep 'ogle-[0-9\.]*.tar.gz$'|sed -n
's/.*-\(.*\)\.t.*/\1/;$ p'
-source=($url/dist/$pkgname-$pkgver.tar.gz alsa-fix.patch \
- $pkgname-$pkgver-gcc4.patch0 \
- $pkgname-dvdread413.patch)
-sha1sums=('bf44e835d04634b4e52fb50bab2a1b78e69391eb' \
- 'e1a378c26ab1c72543360d60312635371e8e7fec' \
- '0f89ce64e7675b2c1861a3dee555c55724de7f9a' \
- '5d93016eb75895b5e22d394a011877239bb0c56a')
-## exporting LIBRARY_PATH fix libdvdcontrol installation
-export LIBRARY_PATH=$Fdestdir/usr/lib/ogle
-
-# optimization OK
diff --git a/source/xapps-extra/ogle/alsa-fix.patch
b/source/xapps-extra/ogle/alsa-fix.patch
deleted file mode 100644
index 667c6a1..000
--- a/source/xapps-extra/ogle/alsa-fix.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -Naur ogle-0.9.2.orig/configure ogle-0.9.2/configure
ogle-0.9.2.orig/configure 2005-07-06 12:19:34.0 +0200
-+++ ogle-0.9.2/configure 2005-07-06 12:19:50.0 +0200
-@@ -13063,7 +13063,7 @@
-
- #include sys/asoundlib.h
- #if defined(SND_LIB_MAJOR) defined(SND_LIB_MINOR)
--#if SND_LIB_MAJOR0 || (SND_LIB_MAJOR==0 SND_LIB_MINOR==5)
-+#if (SND_LIB_MAJOR==0 SND_LIB_MINOR==5)
- AP_maGiC_VALUE
- #endif
- #endif
-diff -Naur ogle-0.9.2.orig/libogleao/alsa_audio.c
ogle-0.9.2/libogleao/alsa_audio.c
ogle-0.9.2.orig/libogleao/alsa_audio.c 2005-07-06 12:19:34.0
+0200
-+++ ogle-0.9.2/libogleao/alsa_audio.c 2005-07-06 12:19:43.0 +0200
-@@ -250,8 +250,8 @@
-
- snd_ctl_close(ctl_handle);
-
-- __diga_end:
- }
-+ __diga_end:
-
- return 0;
- }
-@@ -269,16 +269,51 @@
-
-
- if(i-initialized) {
-+snd_pcm_state_t state;
-+char *name;
-+
- DNOTE(%s, alsa reinit\n);
-
- if((err = snd_pcm_drain(i-alsa_pcm)) 0) {
- ERROR(drain failed: %s\n, snd_strerror(err));
-+ state = snd_pcm_state(i-alsa_pcm);
-+ ERROR(alsa state: %d\n, state);
- }
--
-+
- if((err = snd_pcm_prepare(i-alsa_pcm)) 0) {
- ERROR(prepare failed: %s\n,
- snd_strerror(err));
--}
-+ state = snd_pcm_state(i-alsa_pcm);
-+ ERROR(alsa state: %d\n, state);
-+
-+ name = strdup(snd_pcm_name(i-alsa_pcm));
-+ ERROR(Trying to close/reopen alsa device: %s\n, name);
-+
-+
-+ DNOTE(Closing alsa pcm device: %s\n, name ? name : );
-+
-+ snd_pcm_close(i-alsa_pcm);
-+
-+ i-initialized = 0;
-+ i-sample_rate = 0;
-+ i-samples_written = 0;
-+ i-sample_frame_size = 0;
-+
-+ DNOTE(Reopening alsa pcm device: %s\n, name);
-+
-+ if((err = snd_pcm_open((i-alsa_pcm), name,
-+ SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) 0) {
-+ ERROR(Reopening alsa pcm device '%s': %s\n, name, snd_strerror(err));
-+ }
-+
-+ free(name);
-+
-+ if(err 0) {
-+ return -1;
-+ }
-+}
-+
-+
- }
-
- // these are allocated with alloca and automatically freed when
-@@ -299,8 +334,19 @@
- }
- /* ok */
- break;
-+case 24:
-+ if(audio_info-byteorder == OGLE_AO_BYTEORDER_BE) {
-+ i-format = SND_PCM_FORMAT_S32_BE;
-+ } else {
-+ i-format = SND_PCM_FORMAT_S32_LE;
-+ }
-+ audio_info-sample_resolution = 32;
-+ /* ok */
-+ break;
- default:
- /* not supported */
-+ ERROR(sample resolution %d not implmented\n,
-+ audio_info-sample_resolution);
- return -1;
- break;
- }
-@@ -372,6 +418,7 @@
- i-sample_rate, snd_pcm_format_name(i-format),
- i-channels, i-sample_frame_size);
-
-+ audio_info-sample_resolution = i-sample_frame_size / i-channels * 8;
- return 0;
- }
-
-@@ -380,7 +427,7 @@
- NOTE(xrun_recovery: %s\n, snd_strerror(err));
- if(err == -EPIPE) { /* underrun */
- if((err = snd_pcm_prepare(handle)) 0) {
-- ERROR(Can't recovery from underrun, prepare failed: %s\n,
-+ ERROR(Can't recover from underrun, prepare failed: %s\n,
- snd_strerror(err));
- }
-
[Frugalware-git] frugalware-current: ogle-0.9.2-7-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17e093ee6cc71374a5c7c1171143de8258432887
commit 17e093ee6cc71374a5c7c1171143de8258432887
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Jun 13 00:22:46 2011 +0200
ogle-0.9.2-7-i686
- bin, unmaintained since years
- it was the first dvd player supporting menus, but that's now a common
feature
diff --git a/source/xapps-extra/ogle/FrugalBuild
b/source/xapps-extra/ogle/FrugalBuild
deleted file mode 100644
index 6e05742..000
--- a/source/xapps-extra/ogle/FrugalBuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: Miklos Vajna vmik...@frugalware.org
-
-pkgname=ogle
-pkgver=0.9.2
-pkgrel=7
-pkgdesc=The first opensource DVD player to support DVD menus.
-url=http://www.dtek.chalmers.se/groups/dvd/;
-depends=('a52dec' 'libxv' 'libsm' 'libxinerama' 'alsa-lib' 'libxxf86vm' \
- 'libjpeg=8b' 'libdvdread' 'libxml2=2.7.8' 'libmad')
-groups=('xapps-extra')
-archs=('i686' 'x86_64')
-up2date=lynx -dump $url/dist/|grep 'ogle-[0-9\.]*.tar.gz$'|sed -n
's/.*-\(.*\)\.t.*/\1/;$ p'
-source=($url/dist/$pkgname-$pkgver.tar.gz alsa-fix.patch \
- $pkgname-$pkgver-gcc4.patch0 \
- $pkgname-dvdread413.patch)
-sha1sums=('bf44e835d04634b4e52fb50bab2a1b78e69391eb' \
- 'e1a378c26ab1c72543360d60312635371e8e7fec' \
- '0f89ce64e7675b2c1861a3dee555c55724de7f9a' \
- '5d93016eb75895b5e22d394a011877239bb0c56a')
-## exporting LIBRARY_PATH fix libdvdcontrol installation
-export LIBRARY_PATH=$Fdestdir/usr/lib/ogle
-
-# optimization OK
diff --git a/source/xapps-extra/ogle/alsa-fix.patch
b/source/xapps-extra/ogle/alsa-fix.patch
deleted file mode 100644
index 667c6a1..000
--- a/source/xapps-extra/ogle/alsa-fix.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -Naur ogle-0.9.2.orig/configure ogle-0.9.2/configure
ogle-0.9.2.orig/configure 2005-07-06 12:19:34.0 +0200
-+++ ogle-0.9.2/configure 2005-07-06 12:19:50.0 +0200
-@@ -13063,7 +13063,7 @@
-
- #include sys/asoundlib.h
- #if defined(SND_LIB_MAJOR) defined(SND_LIB_MINOR)
--#if SND_LIB_MAJOR0 || (SND_LIB_MAJOR==0 SND_LIB_MINOR==5)
-+#if (SND_LIB_MAJOR==0 SND_LIB_MINOR==5)
- AP_maGiC_VALUE
- #endif
- #endif
-diff -Naur ogle-0.9.2.orig/libogleao/alsa_audio.c
ogle-0.9.2/libogleao/alsa_audio.c
ogle-0.9.2.orig/libogleao/alsa_audio.c 2005-07-06 12:19:34.0
+0200
-+++ ogle-0.9.2/libogleao/alsa_audio.c 2005-07-06 12:19:43.0 +0200
-@@ -250,8 +250,8 @@
-
- snd_ctl_close(ctl_handle);
-
-- __diga_end:
- }
-+ __diga_end:
-
- return 0;
- }
-@@ -269,16 +269,51 @@
-
-
- if(i-initialized) {
-+snd_pcm_state_t state;
-+char *name;
-+
- DNOTE(%s, alsa reinit\n);
-
- if((err = snd_pcm_drain(i-alsa_pcm)) 0) {
- ERROR(drain failed: %s\n, snd_strerror(err));
-+ state = snd_pcm_state(i-alsa_pcm);
-+ ERROR(alsa state: %d\n, state);
- }
--
-+
- if((err = snd_pcm_prepare(i-alsa_pcm)) 0) {
- ERROR(prepare failed: %s\n,
- snd_strerror(err));
--}
-+ state = snd_pcm_state(i-alsa_pcm);
-+ ERROR(alsa state: %d\n, state);
-+
-+ name = strdup(snd_pcm_name(i-alsa_pcm));
-+ ERROR(Trying to close/reopen alsa device: %s\n, name);
-+
-+
-+ DNOTE(Closing alsa pcm device: %s\n, name ? name : );
-+
-+ snd_pcm_close(i-alsa_pcm);
-+
-+ i-initialized = 0;
-+ i-sample_rate = 0;
-+ i-samples_written = 0;
-+ i-sample_frame_size = 0;
-+
-+ DNOTE(Reopening alsa pcm device: %s\n, name);
-+
-+ if((err = snd_pcm_open((i-alsa_pcm), name,
-+ SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) 0) {
-+ ERROR(Reopening alsa pcm device '%s': %s\n, name, snd_strerror(err));
-+ }
-+
-+ free(name);
-+
-+ if(err 0) {
-+ return -1;
-+ }
-+}
-+
-+
- }
-
- // these are allocated with alloca and automatically freed when
-@@ -299,8 +334,19 @@
- }
- /* ok */
- break;
-+case 24:
-+ if(audio_info-byteorder == OGLE_AO_BYTEORDER_BE) {
-+ i-format = SND_PCM_FORMAT_S32_BE;
-+ } else {
-+ i-format = SND_PCM_FORMAT_S32_LE;
-+ }
-+ audio_info-sample_resolution = 32;
-+ /* ok */
-+ break;
- default:
- /* not supported */
-+ ERROR(sample resolution %d not implmented\n,
-+ audio_info-sample_resolution);
- return -1;
- break;
- }
-@@ -372,6 +418,7 @@
- i-sample_rate, snd_pcm_format_name(i-format),
- i-channels, i-sample_frame_size);
-
-+ audio_info-sample_resolution = i-sample_frame_size / i-channels * 8;
- return 0;
- }
-
-@@ -380,7 +427,7 @@
- NOTE(xrun_recovery: %s\n, snd_strerror(err));
- if(err == -EPIPE) { /* underrun */
- if((err = snd_pcm_prepare(handle)) 0) {
-- ERROR(Can't recovery from underrun, prepare failed: %s\n,
-+ ERROR(Can't recover from underrun, prepare failed: %s\n,
- snd_strerror(err));
- }
-
