pool/flac
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flac?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2007-04-12 16:26:08 +00:00 committed by Git OBS Bridge
parent e3c98fd08b
commit c102f595cc
14 changed files with 171 additions and 4509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flac-1.1.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cff9aa4237cf2ba2f5495459f8869e05e28eb752bca293561f14761c4d682ed0
size 999135

3
flac-1.1.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7369b0737545aab2201b7d8e04560977edac95aa60284912901ddc9994179e35
size 1413727

3635
flac-bmp-plugin.diff
View File

File diff suppressed because it is too large Load Diff

118
flac-compat.dif
View File

@ -1,118 +0,0 @@
--- src/libFLAC/Makefile.am-dist 2002-11-27 15:18:40.000000000 +0100
+++ src/libFLAC/Makefile.am 2002-11-27 15:22:49.000000000 +0100
@@ -63,4 +63,5 @@
seekable_stream_encoder.c \
stream_decoder.c \
stream_encoder.c \
- stream_encoder_framing.c
+ stream_encoder_framing.c \
+ compat.c
--- /dev/null 2002-11-27 15:24:34.000000000 +0100
+++ src/libFLAC/compat.c 2002-11-27 15:28:14.000000000 +0100
@@ -0,0 +1,64 @@
+/*
+ * compat functions
+ */
+
+#include "FLAC/file_decoder.h"
+
+#undef FLAC__stream_decoder_process_one_frame
+#undef FLAC__stream_decoder_process_metadata
+#undef FLAC__stream_decoder_process_whole_stream
+
+#undef FLAC__seekable_stream_decoder_process_one_frame
+#undef FLAC__seekable_stream_decoder_process_metadata
+#undef FLAC__seekable_stream_decoder_process_whole_stream
+
+#undef FLAC__file_decoder_process_one_frame
+#undef FLAC__file_decoder_process_metadata
+#undef FLAC__file_decoder_process_whole_file
+
+FLAC__bool FLAC__stream_decoder_process_one_frame(FLAC__StreamDecoder *decoder)
+{
+ return FLAC__stream_decoder_process_single(decoder);
+}
+
+FLAC__bool FLAC__stream_decoder_process_metadata(FLAC__StreamDecoder *decoder)
+{
+ return FLAC__stream_decoder_process_until_end_of_metadata(decoder);
+}
+
+FLAC__bool FLAC__stream_decoder_process_whole_stream(FLAC__StreamDecoder *decoder)
+{
+ return FLAC__stream_decoder_process_until_end_of_stream(decoder);
+}
+
+
+FLAC__bool FLAC__seekable_stream_decoder_process_one_frame(FLAC__SeekableStreamDecoder *decoder)
+{
+ return FLAC__seekable_stream_decoder_process_single(decoder);
+}
+
+FLAC__bool FLAC__seekable_stream_decoder_process_metadata(FLAC__SeekableStreamDecoder *decoder)
+{
+ return FLAC__seekable_stream_decoder_process_until_end_of_metadata(decoder);
+}
+
+FLAC__bool FLAC__seekable_stream_decoder_process_whole_stream(FLAC__SeekableStreamDecoder *decoder)
+{
+ return FLAC__seekable_stream_decoder_process_until_end_of_stream(decoder);
+}
+
+
+FLAC__bool FLAC__file_decoder_process_one_frame(FLAC__FileDecoder *decoder)
+{
+ return FLAC__file_decoder_process_single(decoder);
+}
+
+FLAC__bool FLAC__file_decoder_process_metadata(FLAC__FileDecoder *decoder)
+{
+ return FLAC__file_decoder_process_until_end_of_metadata(decoder);
+}
+
+FLAC__bool FLAC__file_decoder_process_whole_file(FLAC__FileDecoder *decoder)
+{
+ return FLAC__file_decoder_process_until_end_of_file(decoder);
+}
--- /dev/null 2002-11-27 15:24:28.000000000 +0100
+++ include/FLAC/compat.h 2002-11-27 15:28:38.000000000 +0100
@@ -0,0 +1,20 @@
+/*
+ * compatible wrappers with FLAC 1.0.3
+ */
+
+#ifndef FLAC_COMPAT_H
+#define FLAC_COMPAT_H
+
+#define FLAC__file_decoder_process_one_frame FLAC__file_decoder_process_single
+#define FLAC__file_decoder_process_metadata FLAC__file_decoder_process_until_end_of_metadata
+#define FLAC__file_decoder_process_whole_file FLAC__file_decoder_process_until_end_of_file
+
+#define FLAC__seekable_stream_decoder_process_one_frame FLAC__seekable_stream_decoder_process_single
+#define FLAC__seekable_stream_decoder_process_metadata FLAC__seekable_stream_decoder_process_until_end_of_metadata
+#define FLAC__seekable_stream_decoder_process_whole_stream FLAC__seekable_stream_decoder_process_until_end_of_stream
+
+#define FLAC__stream_decoder_process_one_frame FLAC__stream_decoder_process_single
+#define FLAC__stream_decoder_process_metadata FLAC__stream_decoder_process_until_end_of_metadata
+#define FLAC__stream_decoder_process_whole_stream FLAC__stream_decoder_process_until_end_of_stream
+
+#endif /* FLAC_COMPAT_H */
--- include/FLAC/stream_decoder.h-dist 2002-11-27 15:18:10.000000000 +0100
+++ include/FLAC/stream_decoder.h 2002-11-27 15:18:15.000000000 +0100
@@ -21,6 +21,7 @@
#define FLAC__STREAM_DECODER_H
#include "format.h"
+#include "compat.h"
#ifdef __cplusplus
extern "C" {
--- include/FLAC/Makefile.am-dist 2002-11-27 15:25:31.000000000 +0100
+++ include/FLAC/Makefile.am 2002-11-27 15:29:17.000000000 +0100
@@ -29,4 +29,5 @@
seekable_stream_decoder.h \
seekable_stream_encoder.h \
stream_decoder.h \
- stream_encoder.h
+ stream_encoder.h \
+ compat.h

23
flac-no-xmms.diff
View File

@ -1,10 +1,15 @@
--- configure.in-dist 2005-02-25 12:32:54.000000000 +0100
+++ configure.in 2005-02-25 12:33:45.000000000 +0100
@@ -156,7 +156,6 @@
AC_DEFINE(FLAC__HAS_OGG)
fi
--- configure.in-dist 2007-04-04 15:08:55.000000000 +0200
+++ configure.in 2007-04-04 15:09:38.000000000 +0200
@@ -214,9 +214,9 @@
no) enable_xmms_plugin=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-xmms-plugin) ;;
esac],[enable_xmms_plugin=true])
-if test "x$enable_xmms_plugin" != xfalse ; then
- AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - XMMS support will not be built]))
-fi
+dnl if test "x$enable_xmms_plugin" != xfalse ; then
+dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - XMMS support will not be built]))
+dnl fi
AM_CONDITIONAL(FLaC__HAS_XMMS, test -n "$XMMS_INPUT_PLUGIN_DIR")
-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
dnl check for ogg library

20
flac-plugin-split.diff
View File

@ -1,24 +1,12 @@
--- src/plugin_xmms/Makefile.am-dist 2005-05-25 15:26:22.000000000 +0200
+++ src/plugin_xmms/Makefile.am 2005-05-25 15:28:51.000000000 +0200
@@ -61,8 +61,7 @@
--- src/plugin_xmms/Makefile.am-dist 2007-04-04 15:30:55.000000000 +0200
+++ src/plugin_xmms/Makefile.am 2007-04-04 15:31:43.000000000 +0200
@@ -62,8 +62,7 @@
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- -L$(top_builddir)/src/libFLAC/.libs \
+ -lFLAC \
@OGG_LIBS@ \
@XMMS_LIBS@ \
@LIBICONV@
libxmms_flac_la_LDFLAGS = -module -avoid-version
--- src/plugin_bmp/Makefile.am-dist 2005-05-25 15:43:23.000000000 +0200
+++ src/plugin_bmp/Makefile.am 2005-05-25 15:48:11.000000000 +0200
@@ -58,8 +58,7 @@
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- -L$(top_builddir)/src/libFLAC/.libs \
+ -lFLAC \
@BMP_LIBS@ \
@LIBICONV@
libbmp_flac_la_LDFLAGS = -module -avoid-version

43
flac-printf-format-fix.diff Normal file
View File

@ -0,0 +1,43 @@
--- src/test_grabbag/cuesheet/main.c-dist 2007-04-10 19:14:42.000000000 +0200
+++ src/test_grabbag/cuesheet/main.c 2007-04-10 19:15:33.000000000 +0200
@@ -115,12 +115,12 @@ int main(int argc, char *argv[])
const char *usage = "usage: test_cuesheet cuesheet_file lead_out_offset [ cdda ]\n";
if(argc > 1 && 0 == strcmp(argv[1], "-h")) {
- printf(usage);
+ fputs(usage, stdout);
return 0;
}
if(argc < 3 || argc > 4) {
- fprintf(stderr, usage);
+ fputs(usage, stderr);
return 255;
}
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
if(0 == strcmp(argv[3], "cdda"))
is_cdda = true;
else {
- fprintf(stderr, usage);
+ fputs(usage, stderr);
return 255;
}
}
--- src/test_grabbag/picture/main.c-dist 2007-04-10 19:15:47.000000000 +0200
+++ src/test_grabbag/picture/main.c 2007-04-10 19:16:02.000000000 +0200
@@ -211,12 +211,12 @@ int main(int argc, char *argv[])
const char *usage = "usage: test_pictures path_prefix\n";
if(argc > 1 && 0 == strcmp(argv[1], "-h")) {
- printf(usage);
+ fputs(usage, stdout);
return 0;
}
if(argc != 2) {
- fprintf(stderr, usage);
+ fputs(usage, stderr);
return 255;
}

608
flac-prototypes.dif
View File

@ -1,608 +0,0 @@
--- src/metaflac/operations.c-dist 2005-05-25 16:20:02.000000000 +0200
+++ src/metaflac/operations.c 2005-05-25 16:20:09.000000000 +0200
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <string.h>
-static void show_version();
+static void show_version(void);
static FLAC__bool do_major_operation(const CommandLineOptions *options);
static FLAC__bool do_major_operation_on_file(const char *filename, const CommandLineOptions *options);
static FLAC__bool do_major_operation__list(const char *filename, FLAC__Metadata_Chain *chain, const CommandLineOptions *options);
@@ -83,7 +83,7 @@ FLAC__bool do_operations(const CommandLi
* local routines
*/
-void show_version()
+void show_version(void)
{
printf("metaflac %s\n", FLAC__VERSION_STRING);
}
--- src/plugin_xmms/plugin.c-dist 2005-05-25 16:25:03.000000000 +0200
+++ src/plugin_xmms/plugin.c 2005-05-25 16:25:34.000000000 +0200
@@ -109,14 +109,14 @@ typedef enum {
DECODER_HTTP
} decoder_t;
-static void FLAC_XMMS__init();
+static void FLAC_XMMS__init(void);
static int FLAC_XMMS__is_our_file(char *filename);
static void FLAC_XMMS__play_file(char *filename);
-static void FLAC_XMMS__stop();
+static void FLAC_XMMS__stop(void);
static void FLAC_XMMS__pause(short p);
static void FLAC_XMMS__seek(int time);
-static int FLAC_XMMS__get_time();
-static void FLAC_XMMS__cleanup();
+static int FLAC_XMMS__get_time(void);
+static void FLAC_XMMS__cleanup(void);
static void FLAC_XMMS__get_song_info(char *filename, char **title, int *length);
static void *play_loop_(void *arg);
@@ -128,7 +128,7 @@ static FLAC__StreamDecoderWriteStatus wr
static void metadata_callback_(const void *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
static void error_callback_(const void *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-static void init_decoder_func_tables();
+static void init_decoder_func_tables(void);
static decoder_t source_to_decoder_type (const char *source);
InputPlugin flac_ip =
@@ -181,7 +181,7 @@ static const decoder_funcs_t* DECODER_FU
static decoder_funcs_t const * decoder_func_table_;
-InputPlugin *get_iplugin_info()
+InputPlugin *get_iplugin_info(void)
{
flac_ip.description = g_strdup_printf("Reference FLAC Player v%s", FLAC__VERSION_STRING);
return &flac_ip;
@@ -194,7 +194,7 @@ void set_track_info(const char* title, i
}
}
-static gchar* homedir()
+static gchar* homedir(void)
{
gchar *result;
char *env_home = getenv("HOME");
@@ -212,7 +212,7 @@ static gchar* homedir()
return result;
}
-void FLAC_XMMS__init()
+void FLAC_XMMS__init(void)
{
ConfigFile *cfg;
FLAC__uint32 test = 1;
@@ -368,7 +368,7 @@ void FLAC_XMMS__play_file(char *filename
pthread_create(&decode_thread_, NULL, play_loop_, NULL);
}
-void FLAC_XMMS__stop()
+void FLAC_XMMS__stop(void)
{
if(file_info_.is_playing) {
file_info_.is_playing = false;
@@ -397,7 +397,7 @@ void FLAC_XMMS__seek(int time)
}
}
-int FLAC_XMMS__get_time()
+int FLAC_XMMS__get_time(void)
{
if(audio_error_)
return -2;
@@ -407,7 +407,7 @@ int FLAC_XMMS__get_time()
return flac_ip.output->output_time();
}
-void FLAC_XMMS__cleanup()
+void FLAC_XMMS__cleanup(void)
{
decoder_func_table_ -> safe_decoder_delete(decoder_);
decoder_ = 0;
@@ -668,7 +668,7 @@ static const decoder_funcs_t HTTP_DECODE
static decoder_funcs_t const *decoder_func_table_;
-static void init_decoder_func_tables()
+static void init_decoder_func_tables(void)
{
DECODER_FUNCS [DECODER_FILE] = & FILE_DECODER_FUNCTIONS;
DECODER_FUNCS [DECODER_HTTP] = & HTTP_DECODER_FUNCTIONS;
--- src/plugin_xmms/configure.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/plugin_xmms/configure.h 2005-05-25 16:07:27.000000000 +0200
@@ -69,7 +69,7 @@ typedef struct {
extern flac_config_t flac_cfg;
extern void FLAC_XMMS__configure(void);
-extern void FLAC_XMMS__aboutbox();
+extern void FLAC_XMMS__aboutbox(void);
#endif
--- src/plugin_xmms/fileinfo.c-dist 2005-05-25 16:24:26.000000000 +0200
+++ src/plugin_xmms/fileinfo.c 2005-05-25 16:24:33.000000000 +0200
@@ -136,7 +136,7 @@ static void get_entry_tag(GtkEntry * ent
free(utf8);
}
-static void show_tag()
+static void show_tag(void)
{
set_entry_tag(GTK_ENTRY(title_entry) , FLAC_plugin__tags_get_tag_utf8(tags_, "TITLE"));
set_entry_tag(GTK_ENTRY(artist_entry) , FLAC_plugin__tags_get_tag_utf8(tags_, "ARTIST"));
@@ -189,7 +189,7 @@ static void remove_tag(GtkWidget * w, gp
gtk_widget_destroy(window);
}
-static void show_file_info()
+static void show_file_info(void)
{
FLAC__StreamMetadata streaminfo;
struct stat _stat;
--- src/share/grabbag/file.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/share/grabbag/file.c 2005-05-25 16:07:27.000000000 +0200
@@ -109,7 +109,7 @@ FLAC__bool grabbag__file_remove_file(con
return grabbag__file_change_stats(filename, /*read_only=*/false) && 0 == unlink(filename);
}
-FILE *grabbag__file_get_binary_stdin()
+FILE *grabbag__file_get_binary_stdin(void)
{
/* if something breaks here it is probably due to the presence or
* absence of an underscore before the identifiers 'setmode',
@@ -125,7 +125,7 @@ FILE *grabbag__file_get_binary_stdin()
return stdin;
}
-FILE *grabbag__file_get_binary_stdout()
+FILE *grabbag__file_get_binary_stdout(void)
{
/* if something breaks here it is probably due to the presence or
* absence of an underscore before the identifiers 'setmode',
--- src/share/replaygain_synthesis/replaygain_synthesis.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/share/replaygain_synthesis/replaygain_synthesis.c 2005-05-25 16:07:27.000000000 +0200
@@ -86,7 +86,7 @@
* XORed values of both generators.
*/
-static unsigned int random_int_()
+static unsigned int random_int_(void)
{
static const unsigned char parity_[256] = {
0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
--- src/libFLAC/metadata_iterators.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/metadata_iterators.c 2005-05-25 16:07:27.000000000 +0200
@@ -339,7 +339,7 @@ FLAC_API const char * const FLAC__Metada
};
-FLAC_API FLAC__Metadata_SimpleIterator *FLAC__metadata_simple_iterator_new()
+FLAC_API FLAC__Metadata_SimpleIterator *FLAC__metadata_simple_iterator_new(void)
{
FLAC__Metadata_SimpleIterator *iterator = (FLAC__Metadata_SimpleIterator*)calloc(1, sizeof(FLAC__Metadata_SimpleIterator));
@@ -846,7 +846,7 @@ FLAC_API const char * const FLAC__Metada
};
-static FLAC__Metadata_Node *node_new_()
+static FLAC__Metadata_Node *node_new_(void)
{
return (FLAC__Metadata_Node*)calloc(1, sizeof(FLAC__Metadata_Node));
}
@@ -1308,7 +1308,7 @@ static FLAC__bool chain_rewrite_file_cb_
return true;
}
-FLAC_API FLAC__Metadata_Chain *FLAC__metadata_chain_new()
+FLAC_API FLAC__Metadata_Chain *FLAC__metadata_chain_new(void)
{
FLAC__Metadata_Chain *chain = (FLAC__Metadata_Chain*)calloc(1, sizeof(FLAC__Metadata_Chain));
@@ -1594,7 +1594,7 @@ FLAC_API void FLAC__metadata_chain_sort_
}
-FLAC_API FLAC__Metadata_Iterator *FLAC__metadata_iterator_new()
+FLAC_API FLAC__Metadata_Iterator *FLAC__metadata_iterator_new(void)
{
FLAC__Metadata_Iterator *iterator = (FLAC__Metadata_Iterator*)calloc(1, sizeof(FLAC__Metadata_Iterator));
--- src/libFLAC/file_encoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/file_encoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -98,7 +98,7 @@ FLAC_API const char * const FLAC__FileEn
*
***********************************************************************/
-FLAC_API FLAC__FileEncoder *FLAC__file_encoder_new()
+FLAC_API FLAC__FileEncoder *FLAC__file_encoder_new(void)
{
FLAC__FileEncoder *encoder;
--- src/libFLAC/file_decoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/file_decoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -51,7 +51,7 @@
***********************************************************************/
static void set_defaults_(FLAC__FileDecoder *decoder);
-static FILE *get_binary_stdin_();
+static FILE *get_binary_stdin_(void);
static FLAC__SeekableStreamDecoderReadStatus read_callback_(const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
static FLAC__SeekableStreamDecoderSeekStatus seek_callback_(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data);
static FLAC__SeekableStreamDecoderTellStatus tell_callback_(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
@@ -101,7 +101,7 @@ FLAC_API const char * const FLAC__FileDe
*
***********************************************************************/
-FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new()
+FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new(void)
{
FLAC__FileDecoder *decoder;
@@ -567,7 +567,7 @@ void set_defaults_(FLAC__FileDecoder *de
/*
* This will forcibly set stdin to binary mode (for OSes that require it)
*/
-FILE *get_binary_stdin_()
+FILE *get_binary_stdin_(void)
{
/* if something breaks here it is probably due to the presence or
* absence of an underscore before the identifiers 'setmode',
--- src/libFLAC/bitbuffer.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/bitbuffer.c 2005-05-25 16:07:27.000000000 +0200
@@ -317,7 +317,7 @@ static FLAC__bool bitbuffer_read_from_cl
*
***********************************************************************/
-FLAC__BitBuffer *FLAC__bitbuffer_new()
+FLAC__BitBuffer *FLAC__bitbuffer_new(void)
{
FLAC__BitBuffer *bb = (FLAC__BitBuffer*)calloc(1, sizeof(FLAC__BitBuffer));
--- src/libFLAC/metadata_object.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/metadata_object.c 2005-05-25 16:07:27.000000000 +0200
@@ -1236,7 +1236,7 @@ FLAC_API int FLAC__metadata_object_vorbi
return ok? (int)matching : -1;
}
-FLAC_API FLAC__StreamMetadata_CueSheet_Track *FLAC__metadata_object_cuesheet_track_new()
+FLAC_API FLAC__StreamMetadata_CueSheet_Track *FLAC__metadata_object_cuesheet_track_new(void)
{
return (FLAC__StreamMetadata_CueSheet_Track*)calloc(1, sizeof(FLAC__StreamMetadata_CueSheet_Track));
}
--- src/libFLAC/stream_encoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/stream_encoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -454,7 +454,7 @@ FLAC_API const char * const FLAC__Stream
* Class constructor/destructor
*
*/
-FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new()
+FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new(void)
{
FLAC__StreamEncoder *encoder;
unsigned i;
--- src/libFLAC/stream_decoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/stream_decoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -180,7 +180,7 @@ FLAC_API const char * const FLAC__Stream
* Class constructor/destructor
*
***********************************************************************/
-FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new()
+FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void)
{
FLAC__StreamDecoder *decoder;
unsigned i;
--- src/libFLAC/seekable_stream_encoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/seekable_stream_encoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -110,7 +110,7 @@ FLAC_API const char * const FLAC__Seekab
*
***********************************************************************/
-FLAC_API FLAC__SeekableStreamEncoder *FLAC__seekable_stream_encoder_new()
+FLAC_API FLAC__SeekableStreamEncoder *FLAC__seekable_stream_encoder_new(void)
{
FLAC__SeekableStreamEncoder *encoder;
--- src/libFLAC/seekable_stream_decoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/seekable_stream_decoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -135,7 +135,7 @@ FLAC_API const char * const FLAC__Seekab
*
***********************************************************************/
-FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new()
+FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void)
{
FLAC__SeekableStreamDecoder *decoder;
--- src/libFLAC/include/private/bitbuffer.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libFLAC/include/private/bitbuffer.h 2005-05-25 16:07:27.000000000 +0200
@@ -56,7 +56,7 @@ typedef struct FLAC__BitBuffer FLAC__Bit
/*
* construction, deletion, initialization, cloning functions
*/
-FLAC__BitBuffer *FLAC__bitbuffer_new();
+FLAC__BitBuffer *FLAC__bitbuffer_new(void);
void FLAC__bitbuffer_delete(FLAC__BitBuffer *bb);
FLAC__bool FLAC__bitbuffer_init(FLAC__BitBuffer *bb);
FLAC__bool FLAC__bitbuffer_init_from(FLAC__BitBuffer *bb, const FLAC__byte buffer[], unsigned bytes);
--- src/plugin_common/charset.h-dist 2005-05-25 16:06:18.000000000 +0200
+++ src/plugin_common/charset.h 2005-05-25 16:06:24.000000000 +0200
@@ -30,7 +30,7 @@
* Prototypes *
**************/
-char *FLAC_plugin__charset_get_current();
+char *FLAC_plugin__charset_get_current(void);
char *FLAC_plugin__charset_convert_string(const char *string, char *from, char *to);
/* returns 1 for success, 0 for failure or no iconv */
--- src/libOggFLAC/file_encoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libOggFLAC/file_encoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -100,7 +100,7 @@ OggFLAC_API const char * const OggFLAC__
*
***********************************************************************/
-OggFLAC_API OggFLAC__FileEncoder *OggFLAC__file_encoder_new()
+OggFLAC_API OggFLAC__FileEncoder *OggFLAC__file_encoder_new(void)
{
OggFLAC__FileEncoder *encoder;
--- src/libOggFLAC/file_decoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libOggFLAC/file_decoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -51,7 +51,7 @@
***********************************************************************/
static void set_defaults_(OggFLAC__FileDecoder *decoder);
-static FILE *get_binary_stdin_();
+static FILE *get_binary_stdin_(void);
static OggFLAC__SeekableStreamDecoderReadStatus read_callback_(const OggFLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
static OggFLAC__SeekableStreamDecoderSeekStatus seek_callback_(const OggFLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data);
static OggFLAC__SeekableStreamDecoderTellStatus tell_callback_(const OggFLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
@@ -101,7 +101,7 @@ OggFLAC_API const char * const OggFLAC__
*
***********************************************************************/
-OggFLAC_API OggFLAC__FileDecoder *OggFLAC__file_decoder_new()
+OggFLAC_API OggFLAC__FileDecoder *OggFLAC__file_decoder_new(void)
{
OggFLAC__FileDecoder *decoder;
@@ -558,7 +558,7 @@ void set_defaults_(OggFLAC__FileDecoder
/*
* This will forcibly set stdin to binary mode (for OSes that require it)
*/
-FILE *get_binary_stdin_()
+FILE *get_binary_stdin_(void)
{
/* if something breaks here it is probably due to the presence or
* absence of an underscore before the identifiers 'setmode',
--- src/libOggFLAC/stream_encoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libOggFLAC/stream_encoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -87,7 +87,7 @@ OggFLAC_API const char * const OggFLAC__
* Class constructor/destructor
*
*/
-OggFLAC_API OggFLAC__StreamEncoder *OggFLAC__stream_encoder_new()
+OggFLAC_API OggFLAC__StreamEncoder *OggFLAC__stream_encoder_new(void)
{
OggFLAC__StreamEncoder *encoder;
--- src/libOggFLAC/stream_decoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libOggFLAC/stream_decoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -86,7 +86,7 @@ OggFLAC_API const char * const OggFLAC__
* Class constructor/destructor
*
***********************************************************************/
-OggFLAC_API OggFLAC__StreamDecoder *OggFLAC__stream_decoder_new()
+OggFLAC_API OggFLAC__StreamDecoder *OggFLAC__stream_decoder_new(void)
{
OggFLAC__StreamDecoder *decoder;
--- src/libOggFLAC/seekable_stream_encoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libOggFLAC/seekable_stream_encoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -112,7 +112,7 @@ OggFLAC_API const char * const OggFLAC__
* Class constructor/destructor
*
*/
-OggFLAC_API OggFLAC__SeekableStreamEncoder *OggFLAC__seekable_stream_encoder_new()
+OggFLAC_API OggFLAC__SeekableStreamEncoder *OggFLAC__seekable_stream_encoder_new(void)
{
OggFLAC__SeekableStreamEncoder *encoder;
--- src/libOggFLAC/seekable_stream_decoder.c-dist 2005-05-25 16:07:23.000000000 +0200
+++ src/libOggFLAC/seekable_stream_decoder.c 2005-05-25 16:07:27.000000000 +0200
@@ -129,7 +129,7 @@ OggFLAC_API const char * const OggFLAC__
*
***********************************************************************/
-OggFLAC_API OggFLAC__SeekableStreamDecoder *OggFLAC__seekable_stream_decoder_new()
+OggFLAC_API OggFLAC__SeekableStreamDecoder *OggFLAC__seekable_stream_decoder_new(void)
{
OggFLAC__SeekableStreamDecoder *decoder;
--- include/OggFLAC/file_encoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/OggFLAC/file_encoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -162,7 +162,7 @@ typedef void (*OggFLAC__FileEncoderProgr
* \retval OggFLAC__FileEncoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-OggFLAC_API OggFLAC__FileEncoder *OggFLAC__file_encoder_new();
+OggFLAC_API OggFLAC__FileEncoder *OggFLAC__file_encoder_new(void);
/** Free an encoder instance. Deletes the object pointed to by \a encoder.
*
--- include/OggFLAC/file_decoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/OggFLAC/file_decoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -183,7 +183,7 @@ typedef void (*OggFLAC__FileDecoderError
* \retval OggFLAC__FileDecoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-OggFLAC_API OggFLAC__FileDecoder *OggFLAC__file_decoder_new();
+OggFLAC_API OggFLAC__FileDecoder *OggFLAC__file_decoder_new(void);
/** Free a decoder instance. Deletes the object pointed to by \a decoder.
*
--- include/OggFLAC/stream_encoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/OggFLAC/stream_encoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -183,7 +183,7 @@ typedef void (*OggFLAC__StreamEncoderMet
* \retval OggFLAC__StreamEncoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-OggFLAC_API OggFLAC__StreamEncoder *OggFLAC__stream_encoder_new();
+OggFLAC_API OggFLAC__StreamEncoder *OggFLAC__stream_encoder_new(void);
/** Free an encoder instance. Deletes the object pointed to by \a encoder.
*
--- include/OggFLAC/stream_decoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/OggFLAC/stream_decoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -220,7 +220,7 @@ typedef void (*OggFLAC__StreamDecoderErr
* \retval OggFLAC__StreamDecoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-OggFLAC_API OggFLAC__StreamDecoder *OggFLAC__stream_decoder_new();
+OggFLAC_API OggFLAC__StreamDecoder *OggFLAC__stream_decoder_new(void);
/** Free a decoder instance. Deletes the object pointed to by \a decoder.
*
--- include/OggFLAC/seekable_stream_encoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/OggFLAC/seekable_stream_encoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -251,7 +251,7 @@ typedef FLAC__StreamEncoderWriteStatus (
* \retval OggFLAC__SeekableStreamEncoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-OggFLAC_API OggFLAC__SeekableStreamEncoder *OggFLAC__seekable_stream_encoder_new();
+OggFLAC_API OggFLAC__SeekableStreamEncoder *OggFLAC__seekable_stream_encoder_new(void);
/** Free an encoder instance. Deletes the object pointed to by \a encoder.
*
--- include/OggFLAC/seekable_stream_decoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/OggFLAC/seekable_stream_decoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -334,7 +334,7 @@ typedef void (*OggFLAC__SeekableStreamDe
* \retval OggFLAC__SeekableStreamDecoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-OggFLAC_API OggFLAC__SeekableStreamDecoder *OggFLAC__seekable_stream_decoder_new();
+OggFLAC_API OggFLAC__SeekableStreamDecoder *OggFLAC__seekable_stream_decoder_new(void);
/** Free a decoder instance. Deletes the object pointed to by \a decoder.
*
--- include/FLAC/metadata.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/FLAC/metadata.h 2005-05-25 16:07:27.000000000 +0200
@@ -295,7 +295,7 @@ extern FLAC_API const char * const FLAC_
* \retval FLAC__Metadata_SimpleIterator*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__Metadata_SimpleIterator *FLAC__metadata_simple_iterator_new();
+FLAC_API FLAC__Metadata_SimpleIterator *FLAC__metadata_simple_iterator_new(void);
/** Free an iterator instance. Deletes the object pointed to by \a iterator.
*
@@ -652,7 +652,7 @@ extern FLAC_API const char * const FLAC_
* \retval FLAC__Metadata_Chain*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__Metadata_Chain *FLAC__metadata_chain_new();
+FLAC_API FLAC__Metadata_Chain *FLAC__metadata_chain_new(void);
/** Free a chain instance. Deletes the object pointed to by \a chain.
*
@@ -899,7 +899,7 @@ FLAC_API void FLAC__metadata_chain_sort_
* \retval FLAC__Metadata_Iterator*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__Metadata_Iterator *FLAC__metadata_iterator_new();
+FLAC_API FLAC__Metadata_Iterator *FLAC__metadata_iterator_new(void);
/** Free an iterator instance. Deletes the object pointed to by \a iterator.
*
@@ -1621,7 +1621,7 @@ FLAC_API int FLAC__metadata_object_vorbi
* \retval FLAC__StreamMetadata_CueSheet_Track*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__StreamMetadata_CueSheet_Track *FLAC__metadata_object_cuesheet_track_new();
+FLAC_API FLAC__StreamMetadata_CueSheet_Track *FLAC__metadata_object_cuesheet_track_new(void);
/** Create a copy of an existing CUESHEET track object.
*
--- include/FLAC/file_encoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/FLAC/file_encoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -190,7 +190,7 @@ typedef void (*FLAC__FileEncoderProgress
* \retval FLAC__FileEncoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__FileEncoder *FLAC__file_encoder_new();
+FLAC_API FLAC__FileEncoder *FLAC__file_encoder_new(void);
/** Free an encoder instance. Deletes the object pointed to by \a encoder.
*
--- include/FLAC/file_decoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/FLAC/file_decoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -229,7 +229,7 @@ typedef void (*FLAC__FileDecoderErrorCal
* \retval FLAC__FileDecoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new();
+FLAC_API FLAC__FileDecoder *FLAC__file_decoder_new(void);
/** Free a decoder instance. Deletes the object pointed to by \a decoder.
*
--- include/FLAC/stream_encoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/FLAC/stream_encoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -366,7 +366,7 @@ typedef void (*FLAC__StreamEncoderMetada
* \retval FLAC__StreamEncoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new();
+FLAC_API FLAC__StreamEncoder *FLAC__stream_encoder_new(void);
/** Free an encoder instance. Deletes the object pointed to by \a encoder.
*
--- include/FLAC/stream_decoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/FLAC/stream_decoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -396,7 +396,7 @@ typedef void (*FLAC__StreamDecoderErrorC
* \retval FLAC__StreamDecoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new();
+FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void);
/** Free a decoder instance. Deletes the object pointed to by \a decoder.
*
--- include/FLAC/seekable_stream_encoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/FLAC/seekable_stream_encoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -292,7 +292,7 @@ typedef FLAC__StreamEncoderWriteStatus (
* \retval FLAC__SeekableStreamEncoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__SeekableStreamEncoder *FLAC__seekable_stream_encoder_new();
+FLAC_API FLAC__SeekableStreamEncoder *FLAC__seekable_stream_encoder_new(void);
/** Free an encoder instance. Deletes the object pointed to by \a encoder.
*
--- include/FLAC/seekable_stream_decoder.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/FLAC/seekable_stream_decoder.h 2005-05-25 16:07:27.000000000 +0200
@@ -392,7 +392,7 @@ typedef void (*FLAC__SeekableStreamDecod
* \retval FLAC__SeekableStreamDecoder*
* \c NULL if there was an error allocating memory, else the new instance.
*/
-FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new();
+FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void);
/** Free a decoder instance. Deletes the object pointed to by \a decoder.
*
--- include/share/grabbag/file.h-dist 2005-05-25 16:07:23.000000000 +0200
+++ include/share/grabbag/file.h 2005-05-25 16:07:27.000000000 +0200
@@ -44,8 +44,8 @@ FLAC__bool grabbag__file_change_stats(co
FLAC__bool grabbag__file_remove_file(const char *filename);
/* these will forcibly set stdin/stdout to binary mode (for OSes that require it) */
-FILE *grabbag__file_get_binary_stdin();
-FILE *grabbag__file_get_binary_stdout();
+FILE *grabbag__file_get_binary_stdin(void);
+FILE *grabbag__file_get_binary_stdout(void);
#ifdef __cplusplus
}

23
flac-uninitialized-fix.diff
View File

@ -1,23 +0,0 @@
--- src/metaflac/options.c-dist 2005-05-25 16:23:34.000000000 +0200
+++ src/metaflac/options.c 2005-05-25 16:23:42.000000000 +0200
@@ -555,13 +555,14 @@ FLAC__bool parse_option(int option_index
FLAC__ASSERT(0 != violation);
fprintf(stderr, "ERROR (--%s): malformed seekpoint specification \"%s\",\n %s\n", opt, option_argument, violation);
ok = false;
+ } else {
+ op = find_shorthand_operation(options, OP__ADD_SEEKPOINT);
+ if(0 == op)
+ op = append_shorthand_operation(options, OP__ADD_SEEKPOINT);
+ local_strcat(&(op->argument.add_seekpoint.specification), spec);
+ local_strcat(&(op->argument.add_seekpoint.specification), ";");
+ free(spec);
}
- op = find_shorthand_operation(options, OP__ADD_SEEKPOINT);
- if(0 == op)
- op = append_shorthand_operation(options, OP__ADD_SEEKPOINT);
- local_strcat(&(op->argument.add_seekpoint.specification), spec);
- local_strcat(&(op->argument.add_seekpoint.specification), ";");
- free(spec);
}
else if(0 == strcmp(opt, "add-replay-gain")) {
(void) append_shorthand_operation(options, OP__ADD_REPLAY_GAIN);

34
flac-xmms-fix.diff
View File

@ -1,34 +0,0 @@
--- src/plugin_xmms/http.c-dist 2005-05-25 16:14:03.000000000 +0200
+++ src/plugin_xmms/http.c 2005-05-25 16:17:30.000000000 +0200
@@ -484,8 +484,8 @@ static int http_connect (gchar *url_, gb
flac_cfg.stream.use_udp_channel ? udpspace : "");
if (offset && !head) {
gchar *temp_dead = temp;
- temp = g_strconcat ("%sRange: %ll-\r\n", temp, offset);
+ temp = g_strdup_printf("%sRange: %llu-\r\n", temp, offset);
fprintf (stderr, "%s", temp);
g_free (temp_dead);
}
--- src/plugin_xmms/plugin.c-dist 2005-02-02 07:06:44.000000000 +0100
+++ src/plugin_xmms/plugin.c 2005-08-10 12:48:23.000000000 +0200
@@ -270,7 +270,7 @@ void FLAC_XMMS__init()
xmms_cfg_read_boolean(cfg, "flac", "stream.save_http_stream", &flac_cfg.stream.save_http_stream);
if (!xmms_cfg_read_string(cfg, "flac", "stream.save_http_path", &flac_cfg.stream.save_http_path) ||
! *flac_cfg.stream.save_http_path) {
- if (flac_cfg.stream.save_http_path)
+ if (flac_cfg.stream.save_http_path && *flac_cfg.stream.save_http_path)
g_free (flac_cfg.stream.save_http_path);
flac_cfg.stream.save_http_path = homedir();
}
--- src/plugin_xmms/configure.c-dist 2005-08-10 13:03:54.000000000 +0200
+++ src/plugin_xmms/configure.c 2005-08-10 14:34:39.000000000 +0200
@@ -179,7 +179,7 @@ static void flac_configurewin_ok(GtkWidg
flac_cfg.stream.save_http_stream = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_save_use));
- if (flac_cfg.stream.save_http_path)
+ if (flac_cfg.stream.save_http_path && *flac_cfg.stream.save_http_path)
g_free(flac_cfg.stream.save_http_path);
flac_cfg.stream.save_http_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_save_entry)));

13
flac-xmms.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Apr 10 19:19:43 CEST 2007 - tiwai@suse.de
- fix compile warnings
-------------------------------------------------------------------
Wed Apr 4 16:18:15 CEST 2007 - tiwai@suse.de
- updated to version 1.1.4:
* Fixed a bug in the XMMS plugin where Ctrl-3 (file info)
would cause a crash if the file did not exist
- drop flac-bmp package
-------------------------------------------------------------------
Sat Oct 7 11:54:54 CEST 2006 - aj@suse.de

60
flac-xmms.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package flac-xmms (Version 1.1.2)
# spec file for package flac-xmms (Version 1.1.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -11,21 +11,17 @@
# norootforbuild
Name: flac-xmms
BuildRequires: bmp-devel flac-devel gcc-c++ glitz-devel gtk2-devel id3lib-devel update-desktop-files xmms-devel
BuildRequires: flac-devel gcc-c++ glitz-devel gtk2-devel id3lib-devel update-desktop-files xmms-devel
Summary: XMMS Input Plug-In for the FLAC Audio Format
Version: 1.1.2
Release: 23
License: GPL
Version: 1.1.4
Release: 1
License: GNU General Public License (GPL)
Group: Productivity/Multimedia/Sound/Players
Requires: flac xmms
Requires: libflac xmms
Url: http://flac.sourceforge.net/
Source: flac-%{version}.tar.bz2
Patch1: flac-prototypes.dif
Patch3: flac-compat.dif
Patch4: flac-uninitialized-fix.diff
Patch5: flac-bmp-plugin.diff
Patch1: flac-printf-format-fix.diff
Patch6: flac-plugin-split.diff
Patch7: flac-xmms-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -33,21 +29,6 @@ An XMMS input plug-in for the FLAC audio format.
Authors:
--------
Josh Coalson
%package -n flac-bmp
Summary: BMP Input Plug-In for the FLAC Audio Format
License: GPL
Group: Productivity/Multimedia/Sound/Players
Requires: flac bmp
%description -n flac-bmp
A BMP (Beep-Media-Player) input plug-in for the FLAC audio format.
Authors:
--------
Josh Coalson
@ -55,11 +36,7 @@ Authors:
%prep
%setup -n flac-%{version}
%patch1
%patch3
%patch4
%patch5
%patch6
%patch7
%{?suse_update_config:%{suse_update_config -f}}
%build
@ -71,11 +48,13 @@ extra_opts="--disable-asm-optimizations"
# force to add -fPIC -DPIC
CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC %{warn_flags} -fno-strict-aliasing" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC %{warn_flags} -fno-strict-aliasing" \
./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} $extra_opts
make
./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \
$extra_opts \
--enable-xmms-plugin
make %{?jobs:-j %jobs}
%install
make DESTDIR="$RPM_BUILD_ROOT" install
make -C src/plugin_xmms DESTDIR="$RPM_BUILD_ROOT" install
rm -rf $RPM_BUILD_ROOT%{_bindir}
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.so*
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
@ -91,11 +70,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root)
%{_libdir}/xmms/Input/*.*
%files -n flac-bmp
%defattr(-, root, root)
%{_libdir}/bmp/Input/*.*
%changelog -n flac-xmms
%changelog
* Tue Apr 10 2007 - tiwai@suse.de
- fix compile warnings
* Wed Apr 04 2007 - tiwai@suse.de
- updated to version 1.1.4:
* Fixed a bug in the XMMS plugin where Ctrl-3 (file info)
would cause a crash if the file did not exist
- drop flac-bmp package
* Sat Oct 07 2006 - aj@suse.de
- Cleanup BuildRequires.
* Wed Jan 25 2006 - mls@suse.de

20
flac.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Tue Apr 10 19:09:37 CEST 2007 - tiwai@suse.de
- fix post and postun for libflac.
- fix compile warnings
-------------------------------------------------------------------
Wed Apr 4 16:15:16 CEST 2007 - tiwai@suse.de
- updated to version 1.1.4:
* improved compression with no change to format or decrease
in speed.
* encoding and decoding speedups for all modes. Encoding at
-8 is twice as fast.
* large format support.
* supports FLAC and Ogg FLAC as input encoder.
* misc bug fixes
- split library to libflac sub-package to reduce package
dependencies.
-------------------------------------------------------------------
Wed Jan 25 21:35:54 CET 2006 - mls@suse.de

77
flac.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package flac (Version 1.1.2)
# spec file for package flac (Version 1.1.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -11,19 +11,16 @@
# norootforbuild
Name: flac
BuildRequires: gcc-c++ libogg-devel
BuildRequires: gcc-c++ libogg-devel pkg-config
Summary: Free Lossless Audio Codec
Version: 1.1.2
Release: 21
License: GPL, LGPL
Group: System/Libraries
Version: 1.1.4
Release: 1
License: GNU General Public License (GPL)
Group: Productivity/Multimedia/Sound/Utilities
Source: %{name}-%{version}.tar.bz2
Patch: flac-no-xmms.diff
Patch1: flac-printf-format-fix.diff
URL: http://flac.sourceforge.net/
Patch1: flac-prototypes.dif
Patch2: flac-no-xmms.diff
Patch3: flac-compat.dif
Patch4: flac-uninitialized-fix.diff
Patch7: flac-xmms-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -31,15 +28,30 @@ FLAC is an open source lossless audio codec developed by Josh Coalson.
Authors:
--------
Josh Coalson
%package -n libflac
Summary: Free Lossless Audio Codec Library
License: BSD License and BSD-like
Group: System/Libraries
%description -n libflac
This package contains the library for FLAC (Free Lossless Audio Codec)
developed by Josh Coalson.
Authors:
--------
Josh Coalson
%package devel
Summary: FLAC Library Development Package
License: LGPL
License: BSD License and BSD-like
Group: Development/Libraries/C and C++
Requires: flac = %{version}, glibc-devel, libstdc++-devel, libogg-devel
Requires: libflac = %{version}, glibc-devel, libstdc++-devel, libogg-devel
%description devel
This package contains the files needed to compile programs that use the
@ -53,11 +65,8 @@ Authors:
%prep
%setup
%patch
%patch1
%patch2
%patch3
%patch4
%patch7
%{?suse_update_config:%{suse_update_config -f}}
%build
@ -69,8 +78,10 @@ extra_opts="--disable-asm-optimizations"
# force to add -fPIC -DPIC
CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC %{warn_flags} -fno-strict-aliasing" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC %{warn_flags} -fno-strict-aliasing" \
./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} $extra_opts
make
./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \
$extra_opts \
--disable-xmms-plugin
make %{?jobs:-j %jobs}
%install
make DESTDIR="$RPM_BUILD_ROOT" install
@ -79,10 +90,10 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}
mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}
cp -a AUTHORS README COPYING.* $RPM_BUILD_ROOT%{_docdir}/%{name}
%post
%post -n libflac
%run_ldconfig
%postun
%postun -n libflac
%run_ldconfig
%clean
@ -91,18 +102,36 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc %{_docdir}/%{name}
%{_libdir}/lib*.so.*
%{_bindir}/*
%{_mandir}/man*/*
%files -n libflac
%defattr(-, root, root)
%{_libdir}/lib*.so.*
%files devel
%defattr(-, root, root)
%{_libdir}/lib*.so
%{_libdir}/lib*.*a
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_datadir}/aclocal/*.m4
%changelog -n flac
%changelog
* Tue Apr 10 2007 - tiwai@suse.de
- fix post and postun for libflac.
- fix compile warnings
* Wed Apr 04 2007 - tiwai@suse.de
- updated to version 1.1.4:
* improved compression with no change to format or decrease
in speed.
* encoding and decoding speedups for all modes. Encoding at
-8 is twice as fast.
* large format support.
* supports FLAC and Ogg FLAC as input encoder.
* misc bug fixes
- split library to libflac sub-package to reduce package
dependencies.
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jul 07 2005 - tiwai@suse.de