Compare commits

..

3 commits

Author SHA1 Message Date
Fedora Release Engineering
9ef7d9b428 dist-git conversion 2010-07-29 15:59:40 +00:00
Bill Nottingham
5850ac1c68 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:34:59 +00:00
Warren Togami
fe99fa504f Initialize branch EL-4 for xmms-flac 2007-02-26 19:30:00 +00:00
6 changed files with 162 additions and 1 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
flac-1.1.4.tar.gz

View file

@ -1 +0,0 @@
now provided as a subpackage of flac

25
flac-1.1.2-libtool.patch Normal file
View file

@ -0,0 +1,25 @@
--- flac-1.1.2/src/libFLAC/Makefile.am.moo 2005-03-28 14:40:52.665468000 -0500
+++ flac-1.1.2/src/libFLAC/Makefile.am 2005-03-28 14:41:40.414671000 -0500
@@ -64,7 +64,7 @@
libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
endif
endif
-LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
+#LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
endif
endif
--- flac-1.1.2/configure.in.moo 2005-03-28 14:48:06.733965000 -0500
+++ flac-1.1.2/configure.in 2005-03-28 14:48:25.641039000 -0500
@@ -200,9 +200,9 @@
if test x$debug = xtrue; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
else
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
if test x$GCC = xyes; then
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -Winline -DFLaC__INLINE=__inline__"
fi
fi
CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"

58
flac-1.1.2-xmms.patch Normal file
View file

@ -0,0 +1,58 @@
diff -uNr flac-1.1.2/src/plugin_xmms/configure.c flac-1.1.2.fixed/src/plugin_xmms/configure.c
--- flac-1.1.2/src/plugin_xmms/configure.c 2005-01-25 05:26:29.000000000 +0100
+++ flac-1.1.2.fixed/src/plugin_xmms/configure.c 2005-11-10 20:32:57.000000000 +0100
@@ -55,13 +55,13 @@
100 /* KB */, /* http_buffer_size */
50, /* http_prebuffer */
FALSE, /* use_proxy */
- "", /* proxy_host */
+ NULL, /* proxy_host */
0, /* proxy_port */
FALSE, /* proxy_use_auth */
- "", /* proxy_user */
- "", /* proxy_pass */
+ NULL, /* proxy_user */
+ NULL, /* proxy_pass */
FALSE, /* save_http_stream */
- "", /* save_http_path */
+ NULL, /* save_http_path */
FALSE, /* cast_title_streaming */
FALSE /* use_udp_channel */
},
@@ -159,7 +159,8 @@
flac_cfg.stream.http_prebuffer = (gint) GTK_ADJUSTMENT(streaming_pre_adj)->value;
flac_cfg.stream.use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
- g_free(flac_cfg.stream.proxy_host);
+ if(flac_cfg.stream.proxy_host)
+ g_free(flac_cfg.stream.proxy_host);
flac_cfg.stream.proxy_host = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_host_entry)));
flac_cfg.stream.proxy_port = atoi(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_port_entry)));
@@ -380,7 +381,7 @@
GtkWidget *streaming_size_box, *streaming_size_label, *streaming_size_spin;
GtkWidget *streaming_pre_box, *streaming_pre_label, *streaming_pre_spin;
GtkWidget *streaming_proxy_frame, *streaming_proxy_vbox;
- GtkWidget *streaming_proxy_port_label, *streaming_proxy_host_label;
+ GtkWidget *streaming_proxy_port_label, *streaming_proxy_host_label;
GtkWidget *streaming_save_frame, *streaming_save_vbox;
GtkWidget *streaming_save_label, *streaming_save_browse;
#ifdef FLAC_ICECAST
@@ -666,7 +667,7 @@
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);
+ gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host? 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:"));
@@ -731,7 +732,7 @@
gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label, FALSE, FALSE, 0);
streaming_save_entry = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path);
+ gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path? flac_cfg.stream.save_http_path : "");
gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry, TRUE, TRUE, 0);
streaming_save_browse = gtk_button_new_with_label(_("Browse"));

1
sources Normal file
View file

@ -0,0 +1 @@
3958cbd5b6ed8c14966792538e44223b flac-1.1.4.tar.gz

77
xmms-flac.spec Normal file
View file

@ -0,0 +1,77 @@
%define xmms_inputdir %(xmms-config --input-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General)
Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
Name: xmms-flac
Version: 1.1.4
Release: 1%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://flac.sourceforge.net/
Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: xmms-devel, libogg-devel, gettext-devel
%description
FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming,
seeking, and archival, and gives 25-75% compression on typical CD audio.
This is the input plugin for XMMS to be able to read FLAC files.
%prep
%setup -n flac-%{version}
%build
%configure --with-pic
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__install} -D -m 0755 src/plugin_xmms/.libs/libxmms-flac.so \
%{buildroot}%{xmms_inputdir}/libxmms-flac.so
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc COPYING.GPL
%{xmms_inputdir}/libxmms-flac.so
%changelog
* Thu Feb 15 2007 Matthias Saou <http://freshrpms.net/> 1.1.4-1
- Update to 1.1.4.
- Remove now included "xmms" patch.
- Remove no longer relevant "libtool" patch.
- No longer autoreconf, since we don't patch configure.in anymore.
* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.1.2-27
- FC6 rebuild.
* Mon Feb 13 2006 Matthias Saou <http://freshrpms.net/> 1.1.2-26
- Rebuild for new glibc/gcc.
* Tue Nov 22 2005 Matthias Saou <http://freshrpms.net/> 1.1.2-25
- Update patch with one provided from FLAC CVS by Øyvind Stegard to further
fix configuration dialog crashes (#173723).
* Sat May 28 2005 Matthias Saou <http://freshrpms.net/> 1.1.2-24
- Bump release to 24 since main Core flac obsoletes xmms-flac < 1.1.2-24.
- Add patches from FC flac to fix libtool issues on x86_64.
* Thu May 19 2005 Matthias Saou <http://freshrpms.net/> 1.1.2-2
- Add patch to fix memory double freeing issue (bz #157796).
* Thu May 19 2005 Matthias Saou <http://freshrpms.net/> 1.1.2-1
- Initial RPM release since the plugin was disabled from the main flac in
Core, because xmms was moved to Extras, thus no longer available at build
time for Core packages.
- Laziness has made me include the whole 1.4MB of FLAC sources, but if
someone wants to provide a simple script to extract only the relevant sources
in order to create a custom source package of the plugin only, that would
be great!