Browse Source
Mathieu Doidy <mdoidy@roulaize.net>:
big repository update: * bitlbee-0.82, * bogofilter-0.15.7, * liferea-0.4.4, * mldonkey-2.5-4, * mpc-0.9.2, * mpd-0.9.3, * xcdroast-0.98alpha15 git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1778 c5f82cb5-29bc-0310-9cd0-bff59a50e3bcrocklinux
Mathieu
22 years ago
13 changed files with 28 additions and 169 deletions
Unified View
Diff Options
-
+3 -0Documentation/Developers/CHANGELOG-RENE
-
+1 -0package/mathieu/bitlbee/bitlbee.conf
-
+2 -2package/mathieu/bitlbee/bitlbee.desc
-
+2 -2package/mathieu/bogofilter/bogofilter.desc
-
+2 -2package/mathieu/liferea/liferea.desc
-
+2 -2package/mathieu/mldonkey/mldonkey.desc
-
+2 -2package/mathieu/mpc/mpc.desc
-
+2 -2package/mathieu/mpd/mpd.desc
-
+0 -50package/mathieu/xcdroast/10_dvd_atip.patch
-
+0 -34package/mathieu/xcdroast/20_error_write_tracks.patch
-
+0 -65package/mathieu/xcdroast/30_audio-dev.patch
-
+5 -0package/mathieu/xcdroast/xcdroast.conf
-
+7 -8package/mathieu/xcdroast/xcdroast.desc
@ -1,50 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/mathieu/xcdroast/10_dvd_atip.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU General Public License as published by |
|
||||
# the Free Software Foundation; either version 2 of the License, or |
|
||||
# (at your option) any later version. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
diff -ru xcdroast-0.98alpha14-/src/io.c xcdroast-0.98alpha14/src/io.c
|
|
||||
--- xcdroast-0.98alpha14-/src/io.c 2003-05-29 15:14:42.000000000 +0200
|
|
||||
+++ xcdroast-0.98alpha14/src/io.c 2003-06-15 22:42:15.000000000 +0200
|
|
||||
@@ -5507,7 +5507,11 @@
|
|
||||
} |
|
||||
|
|
||||
/* build command line */ |
|
||||
- get_wrap_path_cdrecord(tmp3);
|
|
||||
+ if (curset.isProDVD) {
|
|
||||
+ get_wrap_path("CDRECORDPRODVD", tmp3);
|
|
||||
+ } else {
|
|
||||
+ get_wrap_path("CDRECORD", tmp3);
|
|
||||
+ }
|
|
||||
g_snprintf(line,MAXLINE,"%s %s -atip 2>&1", |
|
||||
tmp3,tmp); |
|
||||
|
|
||||
@@ -5518,6 +5522,11 @@
|
|
||||
g_error("popen error\n"); |
|
||||
} |
|
||||
|
|
||||
+ /* syntax for dvd-atip is different */
|
|
||||
+ if (is_dvdwriter(curset.writer_devnr)) {
|
|
||||
+ found_atip = 1;
|
|
||||
+ }
|
|
||||
+
|
|
||||
errcount = 0; |
|
||||
for (;;) { |
|
||||
if (fgets(line,MAXLINE,fpin) == NULL) |
|
||||
@ -1,34 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/mathieu/xcdroast/20_error_write_tracks.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU General Public License as published by |
|
||||
# the Free Software Foundation; either version 2 of the License, or |
|
||||
# (at your option) any later version. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
diff -ru xcdroast-0.98alpha14-/src/io.c xcdroast-0.98alpha14/src/io.c
|
|
||||
--- xcdroast-0.98alpha14-/src/io.c 2003-06-15 22:44:04.000000000 +0200
|
|
||||
+++ xcdroast-0.98alpha14/src/io.c 2003-06-15 22:46:10.000000000 +0200
|
|
||||
@@ -6614,7 +6614,7 @@
|
|
||||
read_output_ctrl = 4; |
|
||||
} |
|
||||
/* check Medium error/buffer underrun */ |
|
||||
- if (strncmp(tmp2,"Input/output error",18)) {
|
|
||||
+ if (strncmp(tmp2,"Input/output error",18) == 0) {
|
|
||||
read_output_ctrl = 5; |
|
||||
} |
|
||||
} |
|
||||
@ -1,65 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/mathieu/xcdroast/30_audio-dev.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU General Public License as published by |
|
||||
# the Free Software Foundation; either version 2 of the License, or |
|
||||
# (at your option) any later version. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
diff -ru xcdroast-0.98alpha14.orig/src/io.c xcdroast-0.98alpha14/src/io.c
|
|
||||
--- xcdroast-0.98alpha14.orig/src/io.c 2003-05-29 15:14:42.000000000 +0200
|
|
||||
+++ xcdroast-0.98alpha14/src/io.c 2003-06-14 18:23:33.000000000 +0200
|
|
||||
@@ -1698,11 +1698,11 @@
|
|
||||
#if defined(linux) || defined(__FreeBSD__) |
|
||||
/* for linux check if /dev/dsp or /dev/dsp1 exist */ |
|
||||
|
|
||||
- if (stat("/dev/dsp",&buf) == 0) {
|
|
||||
- dsp = g_list_append(dsp,"/dev/dsp");
|
|
||||
+ if (stat("/dev/sound/dsp",&buf) == 0) {
|
|
||||
+ dsp = g_list_append(dsp,"/dev/sound/dsp");
|
|
||||
} |
|
||||
- if (stat("/dev/dsp1",&buf) == 0) {
|
|
||||
- dsp = g_list_append(dsp,"/dev/dsp1");
|
|
||||
+ if (stat("/dev/sound/dsp1",&buf) == 0) {
|
|
||||
+ dsp = g_list_append(dsp,"/dev/sound/dsp1");
|
|
||||
} |
|
||||
#endif |
|
||||
#if defined(sun) || defined(__OpenBSD__) |
|
||||
@@ -1822,9 +1822,9 @@
|
|
||||
|
|
||||
#if defined(linux) || defined(__FreeBSD__) |
|
||||
|
|
||||
- if (strncmp(dsp,"/dev/dsp",8) == 0) {
|
|
||||
+ if (strncmp(dsp,"/dev/sound/dsp",14) == 0) {
|
|
||||
strcpy(tmp,dsp+8); |
|
||||
- g_snprintf(tmp2,MAXLINE,"/dev/mixer%s",tmp);
|
|
||||
+ g_snprintf(tmp2,MAXLINE,"/dev/sound/mixer%s",tmp);
|
|
||||
|
|
||||
/* does device exist? */ |
|
||||
if (stat(tmp2,&buf) == 0) { |
|
||||
diff -ru xcdroast-0.98alpha14.orig/src/wavplay.c xcdroast-0.98alpha14/src/wavplay.c
|
|
||||
--- xcdroast-0.98alpha14.orig/src/wavplay.c 2003-04-22 22:28:05.000000000 +0200
|
|
||||
+++ xcdroast-0.98alpha14/src/wavplay.c 2003-06-14 18:23:33.000000000 +0200
|
|
||||
@@ -74,7 +74,7 @@
|
|
||||
|
|
||||
|
|
||||
#if defined(linux) || defined(__FreeBSD__) |
|
||||
-#define DEFAULT_AUDIO_DEVICE "/dev/dsp"
|
|
||||
+#define DEFAULT_AUDIO_DEVICE "/dev/sound/dsp"
|
|
||||
#elif defined (aix) |
|
||||
#define DEFAULT_AUDIO_DEVICE "" |
|
||||
#elif defined(__sgi) |
|
||||
@ -0,0 +1,5 @@ |
|||||
|
hook_add prepatch 3 "(cd src; patch -p0 < $archdir/gtk2locale.patch)" |
||||
|
hook_add preconf 3 "tar xvfI $archdir/new_configure.tar.bz2" |
||||
|
|
||||
|
pkgcheck 'gtk\+' X && var_append confopt ' ' '--enable-gtk2' |
||||
|
|
||||