Browse Source

Updated flac (1.1.2 -> 1.2.0)

early
Alejandro Mery 18 years ago
parent
commit
a48ff58a30
  1. 27
      audio/flac/disable-xmms.diff
  2. 11
      audio/flac/flac.conf
  3. 6
      audio/flac/flac.desc
  4. 45
      audio/flac/init.patch

27
audio/flac/disable-xmms.diff

@ -1,27 +0,0 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../flac/disable-xmms.diff
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
# --- T2-COPYRIGHT-NOTE-END ---
--- flac-1.1.2/configure.in.orig 2006-03-06 16:08:00.000000000 +0100
+++ flac-1.1.2/configure.in 2006-03-06 16:08:11.000000000 +0100
@@ -157,7 +157,7 @@
AC_DEFINE(FLAC__HAS_OGG)
fi
-AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built]))
+#AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built]))
AM_CONDITIONAL(FLaC__HAS_XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x)
dnl check for i18n(internationalization); these are from libiconv/gettext

11
audio/flac/flac.conf

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../flac/flac.conf
# Filename: package/.../flac/flac.conf
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -10,11 +11,7 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END ---
# --- SDE-COPYRIGHT-NOTE-END ---
# work around "whatever" - happening on powerpc
var_append GCC_WRAPPER_REMOVE " " "-Wl,-read_only_relocs -Wl,warning"
# stop spreading wrong dependency paths in .la files
pkginstalled xmms || var_append patchfiles ' ' "$confdir/disable-xmms.diff"
hook_add preconf 3 "libtoolize -f -c; aclocal -I build ; autoconf"

6
audio/flac/flac.desc

@ -3,7 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../flac/flac.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
@ -42,8 +42,8 @@
[L] LGPL
[S] Stable
[V] 1.1.2
[V] 1.2.0
[P] X -----5---9 126.400
[D] 4187460555 flac-1.1.2.tar.gz http://dl.sourceforge.net/sourceforge/flac/
[D] 1619064118 flac-1.2.0.tar.gz http://dl.sourceforge.net/sourceforge/flac/

45
audio/flac/init.patch

@ -1,45 +0,0 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../flac/init.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
# --- T2-COPYRIGHT-NOTE-END ---
--- flac-1.1.2_orig/src/plugin_xmms/configure.c 2005-01-25 05:26:29.000000000 +0100
+++ flac-1.1.2/src/plugin_xmms/configure.c 2005-04-03 16:56:57.987305008 +0200
@@ -55,13 +55,13 @@
100 /* KB */, /* http_buffer_size */
50, /* http_prebuffer */
FALSE, /* use_proxy */
- "", /* proxy_host */
+ FALSE, /* proxy_host */
0, /* proxy_port */
FALSE, /* proxy_use_auth */
- "", /* proxy_user */
- "", /* proxy_pass */
+ FALSE, /* proxy_user */
+ FALSE, /* proxy_pass */
FALSE, /* save_http_stream */
- "", /* save_http_path */
+ FALSE, /* save_http_path */
FALSE, /* cast_title_streaming */
FALSE /* use_udp_channel */
},
@@ -666,7 +666,8 @@
gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_label, FALSE, FALSE, 0);
streaming_proxy_host_entry = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host);
+ if(flac_cfg.stream.proxy_host)
+ gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host);
gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_entry, TRUE, TRUE, 0);
streaming_proxy_port_label = gtk_label_new(_("Port:"));
Loading…
Cancel
Save