From 4349957fe41cf5bce43001ced4972eecf41d0e06 Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Tue, 9 Sep 2003 21:11:07 +0000 Subject: [PATCH] Dimitar Zhekov : Contrary to the comment in lame.conf, --enable-mpx3 does not require X11 - if no X11/gtk+ exists, it's skipped. What seems required, however, is a fix for "gtk12-config". I haven't seen a gtk-config under that name. Works (1041). git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1357 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 2 +- package/rene/lame/gtk12-config-fix.patch | 11 +++++++++++ package/rene/lame/lame.conf | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 package/rene/lame/gtk12-config-fix.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 5cd731fee..a17053e54 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -10,7 +10,7 @@ - Alejandro Mery: updates to mnemoc incl. bohem-gc/mono fixes - Clifford Wolf: fixed strace useage in Build-Pkg - fixed openldap to install the .init (#109) - - Dimitar Zhekov: fix mplayer doc copy + - Dimitar Zhekov: fix mplayer doc copy, enable mp3x in lame *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/rene/lame/gtk12-config-fix.patch b/package/rene/lame/gtk12-config-fix.patch new file mode 100644 index 000000000..d5ad56273 --- /dev/null +++ b/package/rene/lame/gtk12-config-fix.patch @@ -0,0 +1,11 @@ +--- ./configure.orig 2002-12-01 18:16:10.000000000 +0200 ++++ ./configure 2003-08-20 11:28:59.000000000 +0300 +@@ -11116,7 +11116,7 @@ + done + done + +- test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="gtk12-config" ++ test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="gtk-config" + ;; + esac + fi diff --git a/package/rene/lame/lame.conf b/package/rene/lame/lame.conf index f722d5e54..baa9bff76 100644 --- a/package/rene/lame/lame.conf +++ b/package/rene/lame/lame.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -#confopt="$confopt --enable-mp3x" # requires X11 +var_append confopt " " "--enable-mp3x" # will be skipped if gtk+12 is missing