openSUSE Commits
Threads by month
- ----- 2024 -----
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2007
- 1 participants
- 1159 discussions
Hello community,
here is the log from the commit of package kdeutils4
checked in at Wed Oct 31 17:20:15 CET 2007.
--------
--- KDE/kdeutils4/kdeutils4.changes 2007-10-18 11:02:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2007-10-26 13:37:08.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct 26 13:37:04 CEST 2007 - dmueller(a)suse.de
+
+- update to KDE 4.0 beta4
+
+-------------------------------------------------------------------
Old:
----
kdeutils-3.94.1.tar.bz2
New:
----
kdeutils-3.95.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.d10501/_old 2007-10-31 17:20:05.000000000 +0100
+++ /var/tmp/diff_new_pack.d10501/_new 2007-10-31 17:20:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 3.94.1)
+# spec file for package kdeutils4 (Version 3.95.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,9 +21,9 @@
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 3.94.1
+Version: 3.95.0
Release: 1
-%define rversion 3.94.1
+%define rversion 3.95.0
Source0: kdeutils-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -613,6 +613,8 @@
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING-DOCS README
%changelog
+* Fri Oct 26 2007 - dmueller(a)suse.de
+- update to KDE 4.0 beta4
* Thu Oct 18 2007 - dmueller(a)suse.de
- update to 3.94.1
* Thu Oct 11 2007 - dmueller(a)suse.de
++++++ kdeutils-3.94.1.tar.bz2 -> kdeutils-3.95.0.tar.bz2 ++++++
++++ 3374 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kdeedu4
checked in at Wed Oct 31 17:19:57 CET 2007.
--------
--- KDE/kdeedu4/kdeedu4.changes 2007-10-20 17:39:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2007-10-31 16:49:28.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Oct 31 16:49:20 CET 2007 - dmueller(a)suse.de
+
+- update to KDE 4.0 Beta4
+
+-------------------------------------------------------------------
Old:
----
kdeedu-3.94.1.tar.bz2
New:
----
kdeedu-3.95.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeedu4.spec ++++++
--- /var/tmp/diff_new_pack.Oj8303/_old 2007-10-31 17:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Oj8303/_new 2007-10-31 17:19:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeedu4 (Version 3.94.1)
+# spec file for package kdeedu4 (Version 3.95.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -23,9 +23,9 @@
Group: System/GUI/KDE
Summary: General Data for KDE Education Applications
Url: http://edu.kde.org
-Version: 3.94.1
+Version: 3.95.0
Release: 1
-%define rversion 3.94.1
+%define rversion 3.95.0
Source0: kdeedu-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -774,6 +774,8 @@
%doc COPYING COPYING-DOCS README
%_kde_share_dir/apps/libkdeedu
%changelog
+* Wed Oct 31 2007 - dmueller(a)suse.de
+- update to KDE 4.0 Beta4
* Sat Oct 20 2007 - dmueller(a)suse.de
- update to 3.94.1
* Tue Oct 09 2007 - dmueller(a)suse.de
++++++ kdeedu-3.94.1.tar.bz2 -> kdeedu-3.95.0.tar.bz2 ++++++
KDE/kdeedu4/kdeedu-3.94.1.tar.bz2 /mounts/work_src_done/STABLE/kdeedu4/kdeedu-3.95.0.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vorbis-tools
checked in at Wed Oct 31 17:19:13 CET 2007.
--------
--- vorbis-tools/vorbis-tools.changes 2007-02-02 11:45:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/vorbis-tools/vorbis-tools.changes 2007-10-31 12:12:14.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Oct 31 14:28:59 CET 2007 - tiwai(a)suse.de
+
+- add support of FLAC 1.1.3 or later (#337916)
+- use find_lang
+
+-------------------------------------------------------------------
New:
----
vorbis-tools-flac-1.1.3.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vorbis-tools.spec ++++++
--- /var/tmp/diff_new_pack.tJ6248/_old 2007-10-31 17:18:06.000000000 +0100
+++ /var/tmp/diff_new_pack.tJ6248/_new 2007-10-31 17:18:06.000000000 +0100
@@ -14,15 +14,16 @@
BuildRequires: alsa-devel audiofile-devel curl-devel flac-devel libao-devel libvorbis-devel pkgconfig speex-devel
Summary: Ogg Vorbis Tools
Version: 1.1.1
-Release: 48
+Release: 123
Group: Productivity/Multimedia/Sound/Utilities
-License: GNU General Public License (GPL)
-URL: http://www.xiph.org/
+License: GPL v2 or later
+Url: http://www.xiph.org/
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-%{version}-warning-fixes.diff
Patch1: vorbis-tools-cflags.diff
Patch2: vorbis-tools-config.diff
Patch3: vorbis-tools-%{version}-curl-7.16.diff
+Patch4: vorbis-tools-flac-1.1.3.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -43,6 +44,7 @@
%patch1
%patch2
%patch3
+%patch4
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -55,19 +57,22 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc/%{name}-%{version}
+%find_lang %{name}
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING README
%doc ogg123/ogg123rc-example
%doc %{_mandir}/man?/*
%{_bindir}/*
%{_datadir}/locale/*/*/*
-
-%changelog -n vorbis-tools
+%changelog
+* Wed Oct 31 2007 - tiwai(a)suse.de
+- add support of FLAC 1.1.3 or later (#337916)
+- use find_lang
* Fri Feb 02 2007 - mmarek(a)suse.cz
- fix build with curl-7.16
- fixed some more compiler warnings
++++++ vorbis-tools-flac-1.1.3.diff ++++++
--- configure.ac-dist 2007-10-31 14:00:24.000000000 +0100
+++ configure.ac 2007-10-31 14:00:33.000000000 +0100
@@ -169,17 +169,33 @@
FLAC_LIBS=""
if test "x$build_flac" = xyes; then
+
AC_CHECK_LIB(m,log,FLAC_LIBS="-lm")
- AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single],
- [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"],
- AC_MSG_WARN([libFLAC missing])
- have_libFLAC=no, [$FLAC_LIBS]
- )
- AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new],
- [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"],
- AC_MSG_WARN([libOggFLAC missing])
- have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]
- )
+
+ dnl First check for libFLAC-1.1.3 or later. As of libFLAC 1.1.3,
+ dnl OggFLAC functionality has been rolled into libFLAC rather
+ dnl than being in a separate libOggFLAC library.
+
+ AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_init_ogg_stream],
+ have_libFLAC=yes, have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS])
+
+ if test "x$have_libFLAC" = xyes; then
+ FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS"
+ else
+ dnl Check for libFLAC prior to 1.1.3
+ AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single],
+ [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"],
+ AC_MSG_WARN([libFLAC missing])
+ have_libFLAC=no, [$FLAC_LIBS]
+ )
+
+ AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new],
+ [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"],
+ AC_MSG_WARN([libOggFLAC missing])
+ have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]
+ )
+ fi
+
AC_CHECK_HEADER(FLAC/stream_decoder.h,,
AC_MSG_WARN(libFLAC headers missing)
have_libFLAC=no,[ ])
--- ogg123/easyflac.c-dist 2005-06-03 12:15:09.000000000 +0200
+++ ogg123/easyflac.c 2007-10-31 14:00:33.000000000 +0100
@@ -33,10 +33,12 @@
*
*/
+#include <FLAC/export.h>
+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
+
#include <stdlib.h>
#include "easyflac.h"
-
FLAC__bool EasyFLAC__is_oggflac(EasyFLAC__StreamDecoder *decoder)
{
return decoder->is_oggflac;
@@ -373,3 +375,5 @@ FLAC__bool EasyFLAC__process_until_end_o
else
return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac);
}
+
+#endif
--- ogg123/flac_format.c-dist 2005-06-03 12:15:09.000000000 +0200
+++ ogg123/flac_format.c 2007-10-31 14:00:33.000000000 +0100
@@ -20,18 +20,26 @@
#include <string.h>
#include <sys/types.h>
#include <math.h>
-#include <FLAC/metadata.h>
+#include <FLAC/all.h>
#include <ao/ao.h>
#include "audio.h"
#include "format.h"
#include "i18n.h"
+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
+#define NEED_EASYFLAC 1
+#endif
+#if NEED_EASYFLAC
#include "easyflac.h"
+#endif
#include "vorbis_comments.h"
-#define DEFAULT_FLAC_FRAME_SIZE 4608
-
typedef struct {
+#if NEED_EASYFLAC
EasyFLAC__StreamDecoder *decoder;
+#else
+ FLAC__StreamDecoder *decoder;
+ int is_oggflac;
+#endif
short channels;
int rate;
int bits_per_sample;
@@ -67,10 +75,18 @@ format_t oggflac_format;
/* Private functions declarations */
-FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+#if NEED_EASYFLAC
+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+#else
+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
+#endif
void resize_buffer(flac_private_t *flac, int newchannels, int newsamples);
/*void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);*/
@@ -155,6 +171,7 @@ decoder_t* flac_init (data_source_t *sou
private->buf_start = 0;
/* Setup FLAC decoder */
+#if NEED_EASYFLAC
if (oggflac_can_decode(source)) {
decoder->format = &oggflac_format;
private->decoder = EasyFLAC__stream_decoder_new(1);
@@ -172,13 +189,40 @@ decoder_t* flac_init (data_source_t *sou
EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
EasyFLAC__init(private->decoder);
+#else
+ if (oggflac_can_decode(source)) {
+ private->is_oggflac = 1;
+ decoder->format = &oggflac_format;
+ } else {
+ private->is_oggflac = 0;
+ decoder->format = &flac_format;
+ }
+ private->decoder = FLAC__stream_decoder_new();
+
+ FLAC__stream_decoder_set_md5_checking(private->decoder, false);
+ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
+ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ /*FLAC__stream_decoder_init(private->decoder);*/
+ if(private->is_oggflac)
+ FLAC__stream_decoder_init_ogg_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
+ else
+ FLAC__stream_decoder_init_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
+#endif
/* Callback will set the total samples and sample rate */
+#if NEED_EASYFLAC
EasyFLAC__process_until_end_of_metadata(private->decoder);
+#else
+ FLAC__stream_decoder_process_until_end_of_metadata(private->decoder);
+#endif
/* Callback will set the number of channels and resize the
audio buffer */
+#if NEED_EASYFLAC
EasyFLAC__process_single(private->decoder);
+#else
+ FLAC__stream_decoder_process_single(private->decoder);
+#endif
/* FLAC API returns signed samples on all streams */
decoder->actual_fmt.signed_sample = 1;
@@ -241,11 +285,19 @@ int flac_read (decoder_t *decoder, void
realsamples += copy;
}
else if (!priv->eos) {
+#if NEED_EASYFLAC
ret = EasyFLAC__process_single(priv->decoder);
if (!ret ||
EasyFLAC__get_state(priv->decoder)
== FLAC__STREAM_DECODER_END_OF_STREAM)
priv->eos = 1; /* Bail out! */
+#else
+ ret = FLAC__stream_decoder_process_single(priv->decoder);
+ if (!ret ||
+ FLAC__stream_decoder_get_state(priv->decoder)
+ == FLAC__STREAM_DECODER_END_OF_STREAM)
+ priv->eos = 1; /* Bail out! */
+#endif
} else
break;
}
@@ -311,8 +363,13 @@ void flac_cleanup (decoder_t *decoder)
free(priv->buf[i]);
free(priv->buf);
+#if NEED_EASYFLAC
EasyFLAC__finish(priv->decoder);
EasyFLAC__stream_decoder_delete(priv->decoder);
+#else
+ FLAC__stream_decoder_finish(priv->decoder);
+ FLAC__stream_decoder_delete(priv->decoder);
+#endif
free(decoder->private);
free(decoder);
@@ -342,7 +399,11 @@ format_t oggflac_format = {
+#if NEED_EASYFLAC
FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
+#else
+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
+#endif
{
decoder_t *e_decoder = client_data;
flac_private_t *priv = e_decoder->private;
@@ -363,7 +424,11 @@ FLAC__StreamDecoderReadStatus easyflac_r
}
+#if NEED_EASYFLAC
FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+#else
+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+#endif
{
decoder_t *e_decoder = client_data;
flac_private_t *priv = e_decoder->private;
@@ -389,7 +454,11 @@ FLAC__StreamDecoderWriteStatus easyflac_
}
+#if NEED_EASYFLAC
void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
{
decoder_t *e_decoder = client_data;
flac_private_t *priv = e_decoder->private;
@@ -409,12 +478,26 @@ void easyflac_metadata_callback(const Ea
}
+#if NEED_EASYFLAC
void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
{
}
+#if !NEED_EASYFLAC
+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
+{
+ decoder_t *e_decoder = client_data;
+ flac_private_t *priv = e_decoder->private;
+
+ return priv->eos;
+}
+#endif
+
void resize_buffer(flac_private_t *flac, int newchannels, int newsamples)
{
@@ -457,7 +540,11 @@ void print_flac_stream_info (decoder_t *
+#if NEED_EASYFLAC
if (EasyFLAC__is_oggflac(priv->decoder))
+#else
+ if (priv->is_oggflac)
+#endif
cb->printf_metadata(decoder->callback_arg, 2,
_("Ogg FLAC stream: %d bits, %d channel, %ld Hz"),
priv->bits_per_sample,
--- oggenc/flac.c-dist 2005-06-03 12:15:10.000000000 +0200
+++ oggenc/flac.c 2007-10-31 14:05:03.000000000 +0100
@@ -20,15 +20,25 @@
#include "platform.h"
#include "resample.h"
-#define DEFAULT_FLAC_FRAME_SIZE 4608
+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
+#define NEED_EASYFLAC 1
+#endif
+
+#if NEED_EASYFLAC
+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+#else
+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
+#endif
-FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-
-void resize_buffer(flacfile *flac, int newchannels, int newsamples);
-void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);
+static void resize_buffer(flacfile *flac, int newchannels, int newsamples);
+static void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);
int flac_id(unsigned char *buf, int len)
@@ -43,7 +53,8 @@ int oggflac_id(unsigned char *buf, int l
{
if (len < 32) return 0;
- return memcmp(buf, "OggS", 4) == 0 && flac_id(buf+28, len - 28);
+ return memcmp(buf, "OggS", 4) == 0 &&
+ (memcmp (buf+28, "\177FLAC", 5) || flac_id(buf+28, len - 28));
}
@@ -76,6 +87,7 @@ int flac_open(FILE *in, oe_enc_opt *opt,
flac->in = in;
/* Setup FLAC decoder */
+#if NEED_EASYFLAC
flac->decoder = EasyFLAC__stream_decoder_new(oggflac_id(oldbuf, buflen));
EasyFLAC__set_client_data(flac->decoder, flac);
EasyFLAC__set_read_callback(flac->decoder, &easyflac_read_callback);
@@ -85,13 +97,31 @@ int flac_open(FILE *in, oe_enc_opt *opt,
EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO);
EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
EasyFLAC__init(flac->decoder);
+#else
+ flac->decoder = FLAC__stream_decoder_new();
+ FLAC__stream_decoder_set_md5_checking(flac->decoder, false);
+ FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO);
+ FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ if(oggflac_id(oldbuf, buflen))
+ FLAC__stream_decoder_init_ogg_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac);
+ else
+ FLAC__stream_decoder_init_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac);
+#endif
/* Callback will set the total samples and sample rate */
+#if NEED_EASYFLAC
EasyFLAC__process_until_end_of_metadata(flac->decoder);
+#else
+ FLAC__stream_decoder_process_until_end_of_metadata(flac->decoder);
+#endif
/* Callback will set the number of channels and resize the
audio buffer */
+#if NEED_EASYFLAC
EasyFLAC__process_single(flac->decoder);
+#else
+ FLAC__stream_decoder_process_single(flac->decoder);
+#endif
/* Copy format info for caller */
opt->rate = flac->rate;
@@ -133,11 +163,19 @@ long flac_read(void *in, float **buffer,
}
else if (!flac->eos)
{
+#if NEED_EASYFLAC
ret = EasyFLAC__process_single(flac->decoder);
if (!ret ||
EasyFLAC__get_state(flac->decoder)
== FLAC__STREAM_DECODER_END_OF_STREAM)
flac->eos = 1; /* Bail out! */
+#else
+ ret = FLAC__stream_decoder_process_single(flac->decoder);
+ if (!ret ||
+ FLAC__stream_decoder_get_state(flac->decoder)
+ == FLAC__STREAM_DECODER_END_OF_STREAM)
+ flac->eos = 1; /* Bail out! */
+#endif
} else
break;
}
@@ -145,7 +183,6 @@ long flac_read(void *in, float **buffer,
return realsamples;
}
-
void flac_close(void *info)
{
int i;
@@ -157,13 +194,22 @@ void flac_close(void *info)
free(flac->buf);
free(flac->oldbuf);
free(flac->comments);
+#if NEED_EASYFLAC
EasyFLAC__finish(flac->decoder);
EasyFLAC__stream_decoder_delete(flac->decoder);
+#else
+ FLAC__stream_decoder_finish(flac->decoder);
+ FLAC__stream_decoder_delete(flac->decoder);
+#endif
free(flac);
}
+#if NEED_EASYFLAC
FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
+#else
+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
+#endif
{
flacfile *flac = (flacfile *) client_data;
int i = 0;
@@ -200,7 +246,11 @@ FLAC__StreamDecoderReadStatus easyflac_r
return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
}
+#if NEED_EASYFLAC
FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+#else
+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+#endif
{
flacfile *flac = (flacfile *) client_data;
int samples = frame->header.blocksize;
@@ -221,7 +271,11 @@ FLAC__StreamDecoderWriteStatus easyflac_
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
+#if NEED_EASYFLAC
void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+#else
+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+#endif
{
flacfile *flac = (flacfile *) client_data;
@@ -240,12 +294,24 @@ void easyflac_metadata_callback(const Ea
}
}
+#if NEED_EASYFLAC
void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+#else
+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+#endif
{
flacfile *flac = (flacfile *) client_data;
}
+#if !NEED_EASYFLAC
+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
+{
+ flacfile *flac = (flacfile *) client_data;
+
+ return feof(flac->in)? true : false;
+}
+#endif
void resize_buffer(flacfile *flac, int newchannels, int newsamples)
{
@@ -292,4 +358,3 @@ void copy_comments (vorbis_comment *v_co
free(comment);
}
}
-
--- oggenc/flac.h-dist 2005-06-03 12:15:10.000000000 +0200
+++ oggenc/flac.h 2007-10-31 14:20:54.000000000 +0100
@@ -5,10 +5,21 @@
#include "encode.h"
#include "audio.h"
#include <stdio.h>
+#include <FLAC/stream_decoder.h>
+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
+#define NEED_EASYFLAC 1
+#endif
+#if NEED_EASYFLAC
+#include <OggFLAC/stream_decoder.h>
#include "easyflac.h"
+#endif
typedef struct {
+#if NEED_EASYFLAC
EasyFLAC__StreamDecoder *decoder;
+#else
+ FLAC__StreamDecoder *decoder;
+#endif
short channels;
int rate;
long totalsamples; /* per channel, of course */
--- oggenc/easyflac.c-dist 2005-06-03 12:15:10.000000000 +0200
+++ oggenc/easyflac.c 2007-10-31 14:00:33.000000000 +0100
@@ -33,6 +33,9 @@
*
*/
+#include <FLAC/export.h>
+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
+
#include <stdlib.h>
#include "easyflac.h"
@@ -373,3 +376,5 @@ FLAC__bool EasyFLAC__process_until_end_o
else
return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac);
}
+
+#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package vdr
checked in at Wed Oct 31 17:17:58 CET 2007.
--------
--- vdr/vdr.changes 2007-06-21 10:50:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/vdr/vdr.changes 2007-10-31 16:09:10.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Oct 31 16:08:55 CET 2007 - dmueller(a)suse.de
+
+- provide vdr-devel (#291443)
+
+-------------------------------------------------------------------
Old:
----
rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vdr.spec ++++++
--- /var/tmp/diff_new_pack.es5249/_old 2007-10-31 17:17:18.000000000 +0100
+++ /var/tmp/diff_new_pack.es5249/_new 2007-10-31 17:17:18.000000000 +0100
@@ -19,13 +19,13 @@
%endif
%define with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}
%define vdrapiversion 1.4.5
-URL: http://www.cadsoft.de/people/kls/vdr/
-License: GNU General Public License (GPL)
+Url: http://www.cadsoft.de/people/kls/vdr/
+License: GPL v2 or later
Group: Hardware/TV
Requires: dvb
-Prereq: /usr/sbin/useradd
+PreReq: /usr/sbin/useradd
Version: 1.4.7
-Release: 13
+Release: 35
Summary: Video Disk Recorder
Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2
Source1: rcvdr
@@ -41,7 +41,6 @@
Source91: README.SuSE-vdr.html
Source92: susebooks.css
Source93: vdr-doc.desktop
-Source99: rpmlintrc
Patch12: vdr-1.3.45-dvbplayer-nosleep.diff
Patch13: vdr-1.4.0-2-utf8-0.1.2-rc2.diff.gz
Patch14: vdr-1.4.3-utf8-fix.diff
@@ -51,6 +50,7 @@
Patch98: vdr-1.3.5-find-v4l-device-kernel-2.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: vdrapi = %vdrapiversion
+Provides: vdr-devel = %version
%if %with_freetype
Requires: xorg-x11-fonts-scalable
%endif
@@ -255,8 +255,9 @@
%{_mandir}/man?/*
/etc/init.d/*
/var/adm/fillup-templates/*
-
%changelog
+* Wed Oct 31 2007 - dmueller(a)suse.de
+- provide vdr-devel (#291443)
* Thu Jun 21 2007 - lnussel(a)suse.de
- require $remote_fs in init script (#285548)
* Mon Jun 11 2007 - lnussel(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package syslog-ng
checked in at Wed Oct 31 17:15:20 CET 2007.
--------
--- syslog-ng/syslog-ng.changes 2007-07-30 14:26:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.changes 2007-10-31 14:05:48.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Oct 31 13:59:33 CET 2007
+
+- Bug #334537: Fixes for acpid filter in syslog-ng.conf
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslog-ng.spec ++++++
--- /var/tmp/diff_new_pack.j32062/_old 2007-10-31 17:14:48.000000000 +0100
+++ /var/tmp/diff_new_pack.j32062/_new 2007-10-31 17:14:48.000000000 +0100
@@ -13,14 +13,14 @@
Name: syslog-ng
BuildRequires: bison flex gperf klogd libol-devel tcpd-devel
Version: 1.6.12
-Release: 21
+Release: 36
License: GPL v2 or later
Group: System/Daemons
Summary: The new-generation syslog-daemon
-URL: http://www.balabit.com/products/syslog_ng/
+Url: http://www.balabit.com/products/syslog_ng/
PreReq: %insserv_prereq %fillup_prereq /sbin/klogd /etc/init.d/syslog
Provides: syslog
-Autoreqprov: on
+AutoReqProv: on
Source0: http://www.balabit.com/downloads/syslog-ng/1.6/src/%{name}-%{version}.tar.gz
Source1: http://www.balabit.com/downloads/syslog-ng/1.6/src/%{name}-%{version}.tar.g…
Source2: syslog-ng.pdf
@@ -256,8 +256,10 @@
%config(noreplace) /etc/syslog-ng/syslog-ng.conf
%config(noreplace) /etc/logrotate.d/syslog-ng
/var/adm/fillup-templates/sysconfig.syslog-ng
-
%changelog
+* Wed Oct 31 17:14:43 CET 2007 - broken(a)suse.de
+ Wed Oct 31 13:59:33 CET 2007
+- Bug #334537: Fixes for acpid filter in syslog-ng.conf
* Mon Jul 30 2007 - mt(a)suse.de
- Feature #302032: Improved patch adding a global summary(secs)
option allowing to specify the summary generation frequency
++++++ syslog-ng.conf.default ++++++
--- syslog-ng/syslog-ng.conf.default 2007-07-30 11:18:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.conf.default 2007-10-31 14:01:03.000000000 +0100
@@ -87,8 +87,8 @@
#
# acpid messages
#
-filter f_acpid_full { match('^\acpid:'); };
-filter f_acpid { level(emerg...notice) and match('^\acpid:'); };
+filter f_acpid_full { match('^acpid:'); };
+filter f_acpid { level(emerg..notice) and match('^acpid:'); };
# this is for the old acpid < 1.0.6
filter f_acpid_old { match('^\[acpid\]:'); };
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pulseaudio
checked in at Wed Oct 31 17:14:41 CET 2007.
--------
--- pulseaudio/pulseaudio.changes 2007-10-11 15:46:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/pulseaudio/pulseaudio.changes 2007-10-31 12:28:02.000000000 +0100
@@ -1,0 +2,25 @@
+Wed Oct 31 14:43:48 CET 2007 - tiwai(a)suse.de
+
+- updated to version 0.9.7:
+ * New threaded lock-free (mostly at least) core
+ * New module for automatic discovery of zeroconf audio devices
+ * Reworked JACK module for better real-time compatibility
+ * PA now suspends access to all audio devices if idle
+ * module-combine is now beefedup to automatically pick up local hw devices
+ * make use of gcc intrinsics for atomic ops, byteswap, tls, where possible
+ * use speex resampler by default
+ * use mmap access by default for ALSA devices
+ * fold OSS mmap driver into normal OSS driver
+ * add LADSPA plugin
+ * add plugin for splitting or remapping channel maps
+ * Use Linux eventfd() if available, instead of hacks around FIFOs
+ * make use of PTHREAD_PRIO_INHERIT for some mutexes, wher it makes sense
+ * cleanup dead SHM frags from /dev/shm, where applicable
+ * automatically store/restore default audio device
+ * add new tool pasuspender tool
+ * X11 session management support
+ * allow global configuration for fragment settings/sizes
+ * PA (if HAL is enabled) now ignores modem sound devices by default
+ * Lots of bug fixes and other improvements
+
+-------------------------------------------------------------------
Old:
----
pulseaudio-0.9.5-use-master.patch
pulseaudio-0.9.6-no-flist-test.diff
pulseaudio-0.9.6.tar.bz2
New:
----
pulseaudio-0.9.7.tar.bz2
pulseaudio-0.9.7-type-punning.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pulseaudio.spec ++++++
--- /var/tmp/diff_new_pack.p29017/_old 2007-10-31 17:13:56.000000000 +0100
+++ /var/tmp/diff_new_pack.p29017/_new 2007-10-31 17:13:56.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package pulseaudio (Version 0.9.6)
+# spec file for package pulseaudio (Version 0.9.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,16 +13,15 @@
Name: pulseaudio
BuildRequires: alsa-devel doxygen glib2-devel hal-devel jack-devel libatomic-ops-devel libavahi-devel liboil-devel libsamplerate-devel libsndfile-devel xorg-x11-devel
Summary: A Networked Sound Server
-Version: 0.9.6
-Release: 43
-License: GPL v2 or later; LGPL v2 or later
+Version: 0.9.7
+Release: 1
+License: GPL v2 or later; LGPL v2.1 or later
Group: System/Sound Daemons
Source: %{name}-%{version}.tar.bz2
Source1: default.pa
Patch: pulseaudio-0.9.5-esd-max-samplesize.diff
-Patch1: pulseaudio-0.9.5-use-master.patch
Patch2: pulseaudio-0.9.6-gcc-fix.diff
-Patch3: pulseaudio-0.9.6-no-flist-test.diff
+Patch3: pulseaudio-0.9.7-type-punning.diff
Url: http://pulseaudio.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -56,7 +55,7 @@
%package devel
Summary: Development package for the pulseaudio library
Group: Development/Libraries/C and C++
-Requires: pulseaudio-libs = %{version}
+Requires: pulseaudio-libs = %{version}, glib2-devel
%description devel
This package contains the files needed to compile programs that use the
@@ -72,11 +71,8 @@
%prep
%setup -q
%patch -p1
-%patch1
%patch2
-%ifarch ppc ppc64
%patch3
-%endif
cp /usr/share/gettext/config.rpath .
%{?suse_update_config:%{suse_update_config -f}}
autoreconf --force --install
@@ -111,6 +107,7 @@
%dir %{_sysconfdir}/pulse
%config %{_sysconfdir}/pulse/*
%{_libdir}/libpulsedsp.so
+/etc/xdg/autostart/*.desktop
%files libs
%defattr(-, root, root)
@@ -127,6 +124,28 @@
%{_libdir}/pkgconfig/*.pc
%{_includedir}/pulse*
%changelog
+* Wed Oct 31 2007 - tiwai(a)suse.de
+- updated to version 0.9.7:
+ * New threaded lock-free (mostly at least) core
+ * New module for automatic discovery of zeroconf audio devices
+ * Reworked JACK module for better real-time compatibility
+ * PA now suspends access to all audio devices if idle
+ * module-combine is now beefedup to automatically pick up local hw devices
+ * make use of gcc intrinsics for atomic ops, byteswap, tls, where possible
+ * use speex resampler by default
+ * use mmap access by default for ALSA devices
+ * fold OSS mmap driver into normal OSS driver
+ * add LADSPA plugin
+ * add plugin for splitting or remapping channel maps
+ * Use Linux eventfd() if available, instead of hacks around FIFOs
+ * make use of PTHREAD_PRIO_INHERIT for some mutexes, wher it makes sense
+ * cleanup dead SHM frags from /dev/shm, where applicable
+ * automatically store/restore default audio device
+ * add new tool pasuspender tool
+ * X11 session management support
+ * allow global configuration for fragment settings/sizes
+ * PA (if HAL is enabled) now ignores modem sound devices by default
+ * Lots of bug fixes and other improvements
* Thu Oct 11 2007 - sbrabec(a)suse.cz
- Use binding specific avahi package.
* Tue Jun 19 2007 - tiwai(a)suse.de
++++++ pulseaudio-0.9.6.tar.bz2 -> pulseaudio-0.9.7.tar.bz2 ++++++
++++ 142243 lines of diff (skipped)
++++++ pulseaudio-0.9.7-type-punning.diff ++++++
--- src/tests/resampler-test.c-dist 2007-10-31 11:59:07.000000000 +0100
+++ src/tests/resampler-test.c 2007-10-31 12:02:38.000000000 +0100
@@ -37,9 +37,13 @@
#include <liboil/liboil.h>
static float swap_float(float a) {
- uint32_t *b = (uint32_t*) &a;
- *b = PA_UINT32_SWAP(*b);
- return a;
+ union {
+ uint32_t i;
+ float f;
+ } b;
+ b.f = a;
+ b.i = PA_UINT32_SWAP(b.i);
+ return b.f;
}
static void dump_block(const pa_sample_spec *ss, const pa_memchunk *chunk) {
--- src/pulsecore/sconv-s16le.c-dist 2007-10-31 11:58:56.000000000 +0100
+++ src/pulsecore/sconv-s16le.c 2007-10-31 12:02:59.000000000 +0100
@@ -95,16 +95,21 @@ void pa_sconv_s16le_from_float32ne(unsig
#endif
}
+union float32 {
+ uint32_t i;
+ float f;
+};
+
void pa_sconv_s16le_to_float32re(unsigned n, const int16_t *a, float *b) {
pa_assert(a);
pa_assert(b);
for (; n > 0; n--) {
int16_t s = *(a++);
- float k = ((float) INT16_FROM(s))/0x7FFF;
- uint32_t *j = (uint32_t*) &k;
- *j = PA_UINT32_SWAP(*j);
- *(b++) = k;
+ union float32 k;
+ k.f = ((float) INT16_FROM(s))/0x7FFF;
+ k.i = PA_UINT32_SWAP(k.i);
+ *(b++) = k.f;
}
}
@@ -114,11 +119,11 @@ void pa_sconv_s16le_from_float32re(unsig
for (; n > 0; n--) {
int16_t s;
- float v = *(a++);
- uint32_t *j = (uint32_t*) &v;
- *j = PA_UINT32_SWAP(*j);
- v = CLAMP(v, -1, 1);
- s = (int16_t) (v * 0x7FFF);
+ union float32 v;
+ v.f = *(a++);
+ v.i = PA_UINT32_SWAP(v.i);
+ v.f = CLAMP(v.f, -1, 1);
+ s = (int16_t) (v.f * 0x7FFF);
*(b++) = INT16_TO(s);
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package poppler
checked in at Wed Oct 31 17:13:49 CET 2007.
--------
--- GNOME/poppler/poppler.changes 2007-10-23 11:54:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/poppler/poppler.changes 2007-10-31 12:39:06.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Oct 31 12:38:48 CET 2007 - sbrabec(a)suse.cz
+
+- Provide and obsolete poppler-doc (#338021).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poppler.spec ++++++
--- /var/tmp/diff_new_pack.n28308/_old 2007-10-31 17:13:15.000000000 +0100
+++ /var/tmp/diff_new_pack.n28308/_new 2007-10-31 17:13:15.000000000 +0100
@@ -13,7 +13,7 @@
Name: poppler
BuildRequires: gtk-doc gtk2-devel libdrm-devel libjpeg-devel libqt4-devel libxml2-devel qt-devel qt3-devel update-desktop-files zlib-devel
Version: 0.6.1
-Release: 1
+Release: 2
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
%define poppler_soname 2
@@ -422,6 +422,9 @@
Group: System/Libraries
Summary: Additional Package Documentation.
Requires: libpoppler2 = %{version}
+# Last appeared in OpenSUSE 10.3:
+Provides: poppler-doc = %{version}
+Obsoletes: poppler-doc <= %{version}
%description -n libpoppler-doc
Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg of
@@ -549,6 +552,8 @@
%defattr (-, root, root)
%{_datadir}/gtk-doc/html/poppler
%changelog
+* Wed Oct 31 2007 - sbrabec(a)suse.cz
+- Provide and obsolete poppler-doc (#338021).
* Tue Oct 23 2007 - sbrabec(a)suse.cz
- Use split-provides. Obsoleting something another package provides
creates a conflict between them.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pavumeter
checked in at Wed Oct 31 17:13:08 CET 2007.
--------
--- pavumeter/pavumeter.changes 2007-06-13 16:11:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/pavumeter/pavumeter.changes 2007-10-31 13:47:25.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Oct 31 16:05:10 CET 2007 - tiwai(a)suse.de
+
+- updated to version 0.9.3:
+ * lower refresh rate; show pretty channel names; other fixes
+
+-------------------------------------------------------------------
Old:
----
pavumeter-0.9.2.tar.bz2
New:
----
pavumeter-0.9.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pavumeter.spec ++++++
--- /var/tmp/diff_new_pack.O27530/_old 2007-10-31 17:12:39.000000000 +0100
+++ /var/tmp/diff_new_pack.O27530/_new 2007-10-31 17:12:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package pavumeter (Version 0.9.2)
+# spec file for package pavumeter (Version 0.9.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,11 +18,11 @@
BuildRequires: gtkmm24-devel
%endif
Summary: PulseAudio Volume Meter
-Version: 0.9.2
+Version: 0.9.3
Release: 1
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Visualization
-URL: http://0pointer.de/lennart/projects/pavumeter/
+Url: http://0pointer.de/lennart/projects/pavumeter/
Source: %{name}-%{version}.tar.bz2
Source1: pavumeter.png
Patch: pavumeter-desktop-fix.diff
@@ -52,6 +52,7 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
%suse_update_desktop_file %{name} AudioVideo Mixer
+%suse_update_desktop_file %{name}-record AudioVideo Mixer
%clean
test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
@@ -63,7 +64,9 @@
%{_bindir}/*
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
-
%changelog
+* Wed Oct 31 2007 - tiwai(a)suse.de
+- updated to version 0.9.3:
+ * lower refresh rate; show pretty channel names; other fixes
* Wed Jun 13 2007 - tiwai(a)suse.de
- initial version: 0.9.2
++++++ pavumeter-0.9.2.tar.bz2 -> pavumeter-0.9.3.tar.bz2 ++++++
++++ 2439 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/ChangeLog new/pavumeter-0.9.3/ChangeLog
--- old/pavumeter-0.9.2/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/pavumeter-0.9.3/ChangeLog 2007-10-30 18:14:48.000000000 +0100
@@ -0,0 +1,210 @@
+2007-10-30 16:43 lennart
+
+ * Makefile.am, doc/README.html.in: prepare next release
+
+2007-09-06 21:50 lennart
+
+ * configure.ac, src/vumeter.cc: - lower refresh rate to 25 fps
+ - show pretty channel names
+ - show device description instead of device name
+
+2007-08-15 23:49 lennart
+
+ * Makefile.am, configure.ac: bump version and add fedora-snapshot
+ target
+
+2007-08-07 00:21 lennart
+
+ * src/Makefile.am, src/pavumeter-record.desktop,
+ src/pavumeter.desktop: add seperate desktop file for capture
+
+2007-08-06 22:49 lennart
+
+ * src/vumeter.cc: remove full stop
+
+2007-08-06 17:37 lennart
+
+ * src/vumeter.cc: Handle parameters properly
+
+2007-08-06 15:54 lennart
+
+ * src/vumeter.cc: make sure to use black color for subtitle to be
+ compatible with all themes
+
+2007-05-23 23:34 lennart
+
+ * LICENSE, autogen.sh, src/vumeter.cc: Fix license mess: change
+ everything to GPL
+
+2006-07-24 20:17 lennart
+
+ * autogen.sh: Make jhbuild happy by adding a file autgen.sh
+
+2006-07-08 13:56 lennart
+
+ * doc/README.html.in: prepare release 0.9.2
+
+2006-06-21 14:12 lennart
+
+ * src/vumeter.cc: include config.h properly
+
+2006-06-20 23:59 lennart
+
+ * configure.ac: bump requied pa version
+
+2006-06-20 22:28 lennart
+
+ * doc/README.html.in, src/vumeter.cc: s/polyp/pulse/ in README
+
+2006-06-20 22:17 lennart
+
+ * Makefile.am, bootstrap.sh, configure.ac, doc/Makefile.am,
+ doc/style.css, src/Makefile.am, src/pavumeter.desktop,
+ src/vumeter.cc: s/polyp/pulse/g
+
+2006-06-02 21:09 lennart
+
+ * src/vumeter.cc: do not show the polypaudio error code if we
+ terminate ourselves due to a reason that is unrelated to
+ polypaudio
+
+2006-06-02 20:53 lennart
+
+ * src/Makefile.am: actually ship the .desktop file
+
+2006-06-02 17:05 ossman
+
+ * src/vumeter.cc: Throw up a dialog for critical errors as stderr
+ might not be visible.
+
+2006-05-31 12:33 ossman
+
+ * src/Makefile.am, src/pavumeter.desktop: Add .desktop file.
+
+2006-05-28 15:44 lennart
+
+ * src/vumeter.cc: set icon for window, add icon to window title
+
+2006-05-26 23:43 lennart
+
+ * configure.ac: bump version
+
+2006-05-26 23:36 lennart
+
+ * doc/README.html.in: doc update
+
+2006-05-13 23:26 lennart
+
+ * configure.ac: bump polypaudio release
+
+2006-04-26 19:17 lennart
+
+ * src/vumeter.cc: compat with 64bit
+
+2006-04-21 20:45 lennart
+
+ * Makefile.am: build system updates
+
+2006-04-21 20:39 lennart
+
+ * bootstrap.sh, configure.ac, doc/README.html.in, doc/style.css:
+ doc update
+
+2006-04-07 21:54 lennart
+
+ * src/vumeter.cc: * update for newest polypaudio API
+ * show channel names from channel map
+
+2006-04-07 21:53 lennart
+
+ * configure.ac: update build system a little for polypaudio 0.8
+
+2005-01-08 23:59 lennart
+
+ * configure.ac, src/vumeter.cc: update for polypaudio 0.8
+
+2004-12-03 15:46 lennart
+
+ * doc/README.html.in: readme update
+
+2004-11-21 18:49 lennart
+
+ * configure.ac: bump version numbers
+
+2004-11-17 03:10 lennart
+
+ * src/vumeter.cc: * implement level decaying
+
+2004-10-27 22:43 lennart
+
+ * configure.ac, doc/README.html.in: prepare next release
+
+2004-10-27 01:14 lennart
+
+ * src/vumeter.cc: update to new API
+
+2004-09-29 20:14 lennart
+
+ * configure.ac, src/vumeter.cc: update to polypaudio 0.6
+
+2004-09-20 21:53 lennart
+
+ * doc/README.html.in: prepare for dist
+
+2004-09-16 22:03 lennart
+
+ * src/vumeter.cc: Don't ignore $POLYP_SOURCE
+ memory leak fix
+
+2004-09-16 00:03 lennart
+
+ * configure.ac, src/vumeter.cc: update for new API
+ show logarthmic levels
+
+2004-09-12 13:17 lennart
+
+ * src: ignore some more
+
+2004-09-12 13:16 lennart
+
+ * configure.ac, src/Makefile: update to polypaudio 0.5
+
+2004-09-08 00:12 lennart
+
+ * doc/README.html.in: typo fix in homepage
+
+2004-09-07 23:54 lennart
+
+ * ., LICENSE, Makefile.am: prepare for release
+
+2004-09-07 23:49 lennart
+
+ * Makefile.am, doc/README.html.in: do missing paman to pavumeter
+ replacements
+
+2004-09-07 23:46 lennart
+
+ * ., Makefile.am, bootstrap.sh, configure.ac, doc, doc/Makefile.am,
+ doc/README.html.in, doc/screenshot.png, doc/style.css, src,
+ src/Makefile, src/Makefile.am: autotoolize
+
+2004-09-07 14:50 lennart
+
+ * src/vumeter.cc: add a nifty title bar
+
+2004-09-07 14:36 lennart
+
+ * src/vumeter.cc: add support for latencies
+
+2004-09-06 21:55 lennart
+
+ * src, src/Makefile, src/vumeter.cc: make it work
+
+2004-09-06 17:50 lennart
+
+ * src, src/Makefile, src/vumeter.cc: initial commit
+
+2004-09-06 17:48 lennart
+
+ * .: Create trunk directory
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/configure.ac new/pavumeter-0.9.3/configure.ac
--- old/pavumeter-0.9.2/configure.ac 2006-06-21 01:59:04.000000000 +0200
+++ new/pavumeter-0.9.3/configure.ac 2007-09-06 23:50:05.000000000 +0200
@@ -1,7 +1,8 @@
+
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac 42 2006-06-20 23:59:05Z lennart $
+# $Id: configure.ac 53 2007-09-06 21:50:05Z lennart $
# This file is part of PulseAudio Volume Meter.
#
@@ -20,7 +21,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
AC_PREREQ(2.57)
-AC_INIT([pavumeter],[0.9.2],[mzihzrgre (at) 0pointer (dot) de])
+AC_INIT([pavumeter],[0.9.3],[mzihzrgre (at) 0pointer (dot) de])
AC_CONFIG_SRCDIR([src/vumeter.cc])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
@@ -48,7 +49,7 @@
PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse -lpulse-mainloop-glib'
echo "*** Found pulseaudio in ../pulseaudio, using that version ***"
else
- PKG_CHECK_MODULES(PULSE, [ libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 ])
+ PKG_CHECK_MODULES(PULSE, [ libpulse >= 0.9.7 libpulse-mainloop-glib >= 0.9.2 ])
fi
AC_SUBST(PULSE_LIBS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/doc/README new/pavumeter-0.9.3/doc/README
--- old/pavumeter-0.9.2/doc/README 2006-07-08 18:07:50.000000000 +0200
+++ new/pavumeter-0.9.3/doc/README 2007-10-30 17:52:59.000000000 +0100
@@ -1,7 +1,6 @@
+ PulseAudio Volume Meter 0.9.3
- PulseAudio Volume Meter 0.9.2
-
- Copyright 2004-2006 Lennart Poettering <mzihzrgre (at) 0pointer (dot)
+ Copyright 2004-2007 Lennart Poettering <mzihzrgre (at) 0pointer (dot)
de>
* [1]License
* [2]News
@@ -15,57 +14,62 @@
License
- 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.
+ 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.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 675 Mass Ave, Cambridge, MA 02139, USA.
News
+ Tue Oct 30 2007:
+
+ [10]Version 0.9.3 released; lower refresh rate; show pretty channel
+ names; other fixes
+
Sat Jul 8 2006:
- [10]Version 0.9.2 released; compatibility with [11]PulseAudio 0.9.2
+ [11]Version 0.9.2 released; compatibility with [12]PulseAudio 0.9.2
Sat May 27 2006:
- [12]Version 0.9.0 released; compatibility with Polypaudio 0.9.0
+ [13]Version 0.9.0 released; compatibility with Polypaudio 0.9.0
Fri Apr 21 2006:
- [13]Version 0.8 released; compatibility with Polypaudio 0.8
+ [14]Version 0.8 released; compatibility with Polypaudio 0.8
Sun Nov 21 2004:
- [14]Version 0.3 released; compatibility with Polypaudio 0.7; decaying
+ [15]Version 0.3 released; compatibility with Polypaudio 0.7; decaying
of signal levels
Thu Oct 28 2004:
- [15]Version 0.3 released; compatibility with Polypaudio 0.6
+ [16]Version 0.3 released; compatibility with Polypaudio 0.6
Mon Sep 20 2004:
- [16]Version 0.2 released; compatibility with Polypaudio 0.5
+ [17]Version 0.2 released; compatibility with Polypaudio 0.5
Wed Sep 9 2004:
- [17]Version 0.1 released
+ [18]Version 0.1 released
Overview
PulseAudio Volume Meter (pavumeter) is a simple GTK volume meter for
- the [18]PulseAudio sound server.
+ the [19]PulseAudio sound server.
- Everybody loves [19]screenshots.
+ Everybody loves [20]screenshots.
Current Status
@@ -86,10 +90,10 @@
maybe Unix versions) since it uses GNU autoconf for source code
configuration.
- pavumeter requires [20]gtkmm installed.
+ pavumeter requires [21]gtkmm installed.
- Obviously pavumeter requires an installation of [21]PulseAudio
- (version 0.9.2).
+ Obviously pavumeter requires an installation of [22]PulseAudio (version
+ 0.9.2).
Installation
@@ -105,22 +109,22 @@
Download
The newest release is always available from
- [22]http://0pointer.de/lennart/projects/pavumeter/
+ [23]http://0pointer.de/lennart/projects/pavumeter/
- The current release is [23]0.9.2
+ The current release is [24]0.9.3
- Get pavumeter's development sources from the [24]Subversion
- [25]repository ([26]viewcvs):
+ Get pavumeter's development sources from the [25]Subversion
+ [26]repository ([27]viewcvs):
svn checkout svn://svn.0pointer.net/pavumeter/trunk pavumeter
If you want to be notified whenever I release a new version of this
- software use the subscription feature of [27]Freshmeat.
- _________________________________________________________________
+ software use the subscription feature of [28]Freshmeat.
+ __________________________________________________________________
- Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, July 2006
+ Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, Oct 2007
- $Id: README.html.in 44 2006-07-08 13:56:26Z lennart $
+ $Id: README.html.in 54 2007-10-30 16:43:04Z lennart $
References
@@ -133,21 +137,22 @@
7. README#installation
8. README#acks
9. README#download
- 10. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
- 11. http://pulseaudio.org/
- 12. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.0.tar.gz
- 13. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.8.tar.gz
- 14. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.4.tar.gz
- 15. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.3.tar.gz
- 16. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.2.tar.gz
- 17. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.1.tar.gz
- 18. http://0pointer.de/lennart/projects/pulseaudio/
- 19. http://0pointer.de/lennart/projects/pavumeter//screenshot.png
- 20. http://gtkmm.sf.net/
- 21. http://pulseaudio.org/
- 22. http://0pointer.de/lennart/projects/pavumeter/
- 23. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
- 24. http://subversion.tigris.org/
- 25. svn://svn.0pointer.net/pavumeter
- 26. http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter
- 27. http://freshmeat.net/projects/pavumeter/
+ 10. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
+ 11. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
+ 12. http://pulseaudio.org/
+ 13. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.0.tar.gz
+ 14. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.8.tar.gz
+ 15. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.4.tar.gz
+ 16. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.3.tar.gz
+ 17. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.2.tar.gz
+ 18. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.1.tar.gz
+ 19. http://0pointer.de/lennart/projects/pulseaudio/
+ 20. http://0pointer.de/lennart/projects/pavumeter//screenshot.png
+ 21. http://gtkmm.sf.net/
+ 22. http://pulseaudio.org/
+ 23. http://0pointer.de/lennart/projects/pavumeter/
+ 24. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
+ 25. http://subversion.tigris.org/
+ 26. svn://svn.0pointer.net/pavumeter
+ 27. http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter
+ 28. http://freshmeat.net/projects/pavumeter/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/doc/README.html new/pavumeter-0.9.3/doc/README.html
--- old/pavumeter-0.9.2/doc/README.html 2006-07-08 18:07:50.000000000 +0200
+++ new/pavumeter-0.9.3/doc/README.html 2007-10-30 17:52:59.000000000 +0100
@@ -1,16 +1,17 @@
+
<?xml version="1.0" encoding="iso-8859-1"?> <!-- -*-html-helper-*- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>PulseAudio Volume Meter 0.9.2</title>
+<title>PulseAudio Volume Meter 0.9.3</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
-<h1><a name="top">PulseAudio Volume Meter 0.9.2</a></h1>
+<h1><a name="top">PulseAudio Volume Meter 0.9.3</a></h1>
-<p><i>Copyright 2004-2006 Lennart Poettering <mzihzrgre (at) 0pointer (dot) de></i></p>
+<p><i>Copyright 2004-2007 Lennart Poettering <mzihzrgre (at) 0pointer (dot) de></i></p>
<ul class="toc">
<li><a href="#license">License</a></li>
@@ -42,6 +43,9 @@
<h2><a name="news">News</a></h2>
+<div class="news-date">Tue Oct 30 2007: </div> <p class="news-text"><a
+href="http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz">Version 0.9.3</a> released; lower refresh rate; show pretty channel names; other fixes</p>
+
<div class="news-date">Sat Jul 8 2006: </div> <p class="news-text"><a
href="http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz">Version 0.9.2</a> released; compatibility with <a href="http://pulseaudio.org/">PulseAudio 0.9.2</a></p>
@@ -73,7 +77,7 @@
<h2><a name="status">Current Status</a></h2>
<p>Works perfectly.</p>
-
+
<h2><a name="documentation">Documentation</a></h2>
<p>There is not much to say. Just run <tt>pavumeter</tt> and see
@@ -92,7 +96,7 @@
<p><tt>pavumeter</tt> requires <a href="http://gtkmm.sf.net/"><tt>gtkmm</tt></a> installed.</p>
<p>Obviously <tt>pavumeter</tt> requires an installation of <a href="http://pulseaudio.org">PulseAudio</a> (version 0.9.2).</p>
-
+
<h2><a name="installation">Installation</a></h2>
<p>As this package is made with the GNU autotools you should run
@@ -109,7 +113,7 @@
<p>The newest release is always available from <a href="http://0pointer.de/lennart/projects/pavumeter/">http://0pointer.de/lennart/projects/pavumeter/</a></p>
-<p>The current release is <a href="http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz">0.9.2</a></p>
+<p>The current release is <a href="http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz">0.9.3</a></p>
<p>Get <tt>pavumeter</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="svn://svn.0pointer.net/pavumeter">repository</a> (<a href="http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter">viewcvs</a>): </p>
@@ -118,8 +122,8 @@
<p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/pavumeter/">Freshmeat</a>.</p>
<hr/>
-<address class="grey">Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, July 2006</address>
-<div class="grey"><i>$Id: README.html.in 44 2006-07-08 13:56:26Z lennart $</i></div>
+<address class="grey">Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, Oct 2007</address>
+<div class="grey"><i>$Id: README.html.in 54 2007-10-30 16:43:04Z lennart $</i></div>
</body>
</html>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/doc/README.html.in new/pavumeter-0.9.3/doc/README.html.in
--- old/pavumeter-0.9.2/doc/README.html.in 2006-07-08 18:07:34.000000000 +0200
+++ new/pavumeter-0.9.3/doc/README.html.in 2007-10-30 17:43:04.000000000 +0100
@@ -1,3 +1,4 @@
+
<?xml version="1.0" encoding="iso-8859-1"?> <!-- -*-html-helper-*- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,7 +11,7 @@
<body>
<h1><a name="top">PulseAudio Volume Meter @PACKAGE_VERSION@</a></h1>
-<p><i>Copyright 2004-2006 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p>
+<p><i>Copyright 2004-2007 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p>
<ul class="toc">
<li><a href="#license">License</a></li>
@@ -42,6 +43,9 @@
<h2><a name="news">News</a></h2>
+<div class="news-date">Tue Oct 30 2007: </div> <p class="news-text"><a
+href="@PACKAGE_URL@pavumeter-0.9.3.tar.gz">Version 0.9.3</a> released; lower refresh rate; show pretty channel names; other fixes</p>
+
<div class="news-date">Sat Jul 8 2006: </div> <p class="news-text"><a
href="@PACKAGE_URL@pavumeter-0.9.2.tar.gz">Version 0.9.2</a> released; compatibility with <a href="http://pulseaudio.org/">PulseAudio 0.9.2</a></p>
@@ -73,7 +77,7 @@
<h2><a name="status">Current Status</a></h2>
<p>Works perfectly.</p>
-
+
<h2><a name="documentation">Documentation</a></h2>
<p>There is not much to say. Just run <tt>pavumeter</tt> and see
@@ -92,7 +96,7 @@
<p><tt>pavumeter</tt> requires <a href="http://gtkmm.sf.net/"><tt>gtkmm</tt></a> installed.</p>
<p>Obviously <tt>pavumeter</tt> requires an installation of <a href="http://pulseaudio.org">PulseAudio</a> (version 0.9.2).</p>
-
+
<h2><a name="installation">Installation</a></h2>
<p>As this package is made with the GNU autotools you should run
@@ -118,8 +122,8 @@
<p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/pavumeter/">Freshmeat</a>.</p>
<hr/>
-<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, July 2006</address>
-<div class="grey"><i>$Id: README.html.in 44 2006-07-08 13:56:26Z lennart $</i></div>
+<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, Oct 2007</address>
+<div class="grey"><i>$Id: README.html.in 54 2007-10-30 16:43:04Z lennart $</i></div>
</body>
</html>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/LICENSE new/pavumeter-0.9.3/LICENSE
--- old/pavumeter-0.9.2/LICENSE 2004-09-08 01:49:23.000000000 +0200
+++ new/pavumeter-0.9.3/LICENSE 2007-05-24 01:33:25.000000000 +0200
@@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -15,7 +15,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@@ -303,17 +303,16 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/Makefile.am new/pavumeter-0.9.3/Makefile.am
--- old/pavumeter-0.9.2/Makefile.am 2006-06-21 00:17:23.000000000 +0200
+++ new/pavumeter-0.9.3/Makefile.am 2007-10-30 17:43:04.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 40 2006-06-20 22:17:24Z lennart $
+# $Id: Makefile.am 54 2007-10-30 16:43:04Z lennart $
#
# This file is part of PulseAudio Volume Meter.
#
@@ -35,4 +35,15 @@
cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/pavumeter
ln -sf README.html $$HOME/homepage/private/projects/pavumeter/index.html
+fedora-snapshot: dist
+ cp $(distdir).tar.gz $$HOME/cvs.fedora/pavumeter/devel/$(distdir).svn`date +%Y%m%d`.tar.gz
+
+
.PHONY: homepage
+
+dist-hook:
+ if test -d .svn ; then \
+ svn update ; \
+ chmod u+w ${distdir}/ChangeLog || true ; \
+ svn2cl -o ${distdir}/ChangeLog ; \
+ fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/README new/pavumeter-0.9.3/README
--- old/pavumeter-0.9.2/README 2006-07-08 18:07:50.000000000 +0200
+++ new/pavumeter-0.9.3/README 2007-10-30 17:52:59.000000000 +0100
@@ -1,7 +1,6 @@
+ PulseAudio Volume Meter 0.9.3
- PulseAudio Volume Meter 0.9.2
-
- Copyright 2004-2006 Lennart Poettering <mzihzrgre (at) 0pointer (dot)
+ Copyright 2004-2007 Lennart Poettering <mzihzrgre (at) 0pointer (dot)
de>
* [1]License
* [2]News
@@ -15,57 +14,62 @@
License
- 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.
+ 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.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 675 Mass Ave, Cambridge, MA 02139, USA.
News
+ Tue Oct 30 2007:
+
+ [10]Version 0.9.3 released; lower refresh rate; show pretty channel
+ names; other fixes
+
Sat Jul 8 2006:
- [10]Version 0.9.2 released; compatibility with [11]PulseAudio 0.9.2
+ [11]Version 0.9.2 released; compatibility with [12]PulseAudio 0.9.2
Sat May 27 2006:
- [12]Version 0.9.0 released; compatibility with Polypaudio 0.9.0
+ [13]Version 0.9.0 released; compatibility with Polypaudio 0.9.0
Fri Apr 21 2006:
- [13]Version 0.8 released; compatibility with Polypaudio 0.8
+ [14]Version 0.8 released; compatibility with Polypaudio 0.8
Sun Nov 21 2004:
- [14]Version 0.3 released; compatibility with Polypaudio 0.7; decaying
+ [15]Version 0.3 released; compatibility with Polypaudio 0.7; decaying
of signal levels
Thu Oct 28 2004:
- [15]Version 0.3 released; compatibility with Polypaudio 0.6
+ [16]Version 0.3 released; compatibility with Polypaudio 0.6
Mon Sep 20 2004:
- [16]Version 0.2 released; compatibility with Polypaudio 0.5
+ [17]Version 0.2 released; compatibility with Polypaudio 0.5
Wed Sep 9 2004:
- [17]Version 0.1 released
+ [18]Version 0.1 released
Overview
PulseAudio Volume Meter (pavumeter) is a simple GTK volume meter for
- the [18]PulseAudio sound server.
+ the [19]PulseAudio sound server.
- Everybody loves [19]screenshots.
+ Everybody loves [20]screenshots.
Current Status
@@ -86,10 +90,10 @@
maybe Unix versions) since it uses GNU autoconf for source code
configuration.
- pavumeter requires [20]gtkmm installed.
+ pavumeter requires [21]gtkmm installed.
- Obviously pavumeter requires an installation of [21]PulseAudio
- (version 0.9.2).
+ Obviously pavumeter requires an installation of [22]PulseAudio (version
+ 0.9.2).
Installation
@@ -105,22 +109,22 @@
Download
The newest release is always available from
- [22]http://0pointer.de/lennart/projects/pavumeter/
+ [23]http://0pointer.de/lennart/projects/pavumeter/
- The current release is [23]0.9.2
+ The current release is [24]0.9.3
- Get pavumeter's development sources from the [24]Subversion
- [25]repository ([26]viewcvs):
+ Get pavumeter's development sources from the [25]Subversion
+ [26]repository ([27]viewcvs):
svn checkout svn://svn.0pointer.net/pavumeter/trunk pavumeter
If you want to be notified whenever I release a new version of this
- software use the subscription feature of [27]Freshmeat.
- _________________________________________________________________
+ software use the subscription feature of [28]Freshmeat.
+ __________________________________________________________________
- Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, July 2006
+ Lennart Poettering <mzihzrgre (at) 0pointer (dot) de>, Oct 2007
- $Id: README.html.in 44 2006-07-08 13:56:26Z lennart $
+ $Id: README.html.in 54 2007-10-30 16:43:04Z lennart $
References
@@ -133,21 +137,22 @@
7. README#installation
8. README#acks
9. README#download
- 10. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
- 11. http://pulseaudio.org/
- 12. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.0.tar.gz
- 13. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.8.tar.gz
- 14. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.4.tar.gz
- 15. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.3.tar.gz
- 16. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.2.tar.gz
- 17. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.1.tar.gz
- 18. http://0pointer.de/lennart/projects/pulseaudio/
- 19. http://0pointer.de/lennart/projects/pavumeter//screenshot.png
- 20. http://gtkmm.sf.net/
- 21. http://pulseaudio.org/
- 22. http://0pointer.de/lennart/projects/pavumeter/
- 23. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
- 24. http://subversion.tigris.org/
- 25. svn://svn.0pointer.net/pavumeter
- 26. http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter
- 27. http://freshmeat.net/projects/pavumeter/
+ 10. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
+ 11. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.2.tar.gz
+ 12. http://pulseaudio.org/
+ 13. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.0.tar.gz
+ 14. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.8.tar.gz
+ 15. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.4.tar.gz
+ 16. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.3.tar.gz
+ 17. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.2.tar.gz
+ 18. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.1.tar.gz
+ 19. http://0pointer.de/lennart/projects/pulseaudio/
+ 20. http://0pointer.de/lennart/projects/pavumeter//screenshot.png
+ 21. http://gtkmm.sf.net/
+ 22. http://pulseaudio.org/
+ 23. http://0pointer.de/lennart/projects/pavumeter/
+ 24. http://0pointer.de/lennart/projects/pavumeter/pavumeter-0.9.3.tar.gz
+ 25. http://subversion.tigris.org/
+ 26. svn://svn.0pointer.net/pavumeter
+ 27. http://0pointer.net/cgi-bin/viewcvs.cgi/?root=pavumeter
+ 28. http://freshmeat.net/projects/pavumeter/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/src/Makefile.am new/pavumeter-0.9.3/src/Makefile.am
--- old/pavumeter-0.9.2/src/Makefile.am 2006-06-21 00:17:23.000000000 +0200
+++ new/pavumeter-0.9.3/src/Makefile.am 2007-08-07 02:21:14.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 40 2006-06-20 22:17:24Z lennart $
+# $Id: Makefile.am 51 2007-08-07 00:21:13Z lennart $
#
# This file is part of PulseAudio Volume Meter.
#
@@ -26,4 +26,4 @@
pavumeter_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS)
pavumeter_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS)
-dist_desktop_DATA=pavumeter.desktop
+dist_desktop_DATA=pavumeter.desktop pavumeter-record.desktop
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/src/pavumeter.desktop new/pavumeter-0.9.3/src/pavumeter.desktop
--- old/pavumeter-0.9.2/src/pavumeter.desktop 2006-06-21 00:08:22.000000000 +0200
+++ new/pavumeter-0.9.3/src/pavumeter.desktop 2007-08-07 02:20:01.000000000 +0200
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
-Name=PulseAudio Volume Meter
-GenericName=Volume Meter
-Comment=Monitor the output or input volume
+Name=PulseAudio Volume Meter (Playback)
+GenericName=Playback Volume Meter
+Comment=Monitor the output volume
Exec=pavumeter
Icon=audio-input-microphone
StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/src/pavumeter-record.desktop new/pavumeter-0.9.3/src/pavumeter-record.desktop
--- old/pavumeter-0.9.2/src/pavumeter-record.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/pavumeter-0.9.3/src/pavumeter-record.desktop 2007-08-07 02:20:30.000000000 +0200
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=PulseAudio Volume Meter (Capture)
+GenericName=Capture Volume Meter
+Comment=Monitor the input volume
+Exec=pavumeter --record
+Icon=audio-input-microphone
+StartupNotify=true
+Type=Application
+Categories=Application;AudioVideo;Audio;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pavumeter-0.9.2/src/vumeter.cc new/pavumeter-0.9.3/src/vumeter.cc
--- old/pavumeter-0.9.2/src/vumeter.cc 2006-06-21 16:12:20.000000000 +0200
+++ new/pavumeter-0.9.3/src/vumeter.cc 2007-09-06 23:50:06.000000000 +0200
@@ -1,10 +1,10 @@
-/* $Id: vumeter.cc 43 2006-06-21 14:12:21Z lennart $ */
+/* $Id: vumeter.cc 53 2007-09-06 21:50:05Z lennart $ */
/***
This file is part of pavumeter.
pavumeter is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published
+ 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.
@@ -13,7 +13,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU Lesser General Public License
+ You should have received a copy of the GNU General Public License
along with pavumeter; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
@@ -36,7 +36,7 @@
class MainWindow : public Gtk::Window {
public:
- MainWindow(const pa_channel_map &map, const char *source_name);
+ MainWindow(const pa_channel_map &map, const char *source_name, const char *description);
virtual ~MainWindow();
protected:
@@ -88,7 +88,7 @@
virtual void updateLatency(pa_usec_t l);
};
-MainWindow::MainWindow(const pa_channel_map &map, const char *source_name) :
+MainWindow::MainWindow(const pa_channel_map &map, const char *, const char *description) :
Gtk::Window(),
table(1, 2),
latency(0) {
@@ -121,7 +121,7 @@
titleLabel.set_markup("<span size=\"18000\" color=\"black\"><b>PulseAudio Volume Meter</b></span>");
titleLabel.set_alignment(0, 1);
- snprintf(t, sizeof(t), "Showing signal levels of source <b>%s</b>.", source_name);
+ snprintf(t, sizeof(t), "<span color=\"black\">Showing signal levels of <b>%s</b></span>", description);
subtitleLabel.set_markup(t);
subtitleLabel.set_alignment(0, 0);
@@ -133,15 +133,15 @@
vbox.pack_start(table, true, true);
for (n = 0; n < map.channels; n++) {
- snprintf(t, sizeof(t), "<b>%s:</b>", pa_channel_position_to_string(map.map[n]));
+ snprintf(t, sizeof(t), "<b>%s</b>", pa_channel_position_to_pretty_string(map.map[n]));
addChannel(t);
}
g_assert(channels.size() == map.channels);
levels = NULL;
- display_timeout_signal_connection = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::on_display_timeout), 10);
- calc_timeout_signal_connection = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::on_calc_timeout), 50);
+ display_timeout_signal_connection = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::on_display_timeout), 40);
+ calc_timeout_signal_connection = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::on_calc_timeout), 100);
show_all();
}
@@ -326,6 +326,7 @@
static pa_context *context = NULL;
static pa_stream *stream = NULL;
static char* device_name = NULL;
+static char* device_description = NULL;
static enum {
PLAYBACK,
RECORD
@@ -395,7 +396,7 @@
case PA_STREAM_READY:
g_assert(!mainWindow);
- mainWindow = new MainWindow(*pa_stream_get_channel_map(s), device_name);
+ mainWindow = new MainWindow(*pa_stream_get_channel_map(s), device_name, device_description);
g_timeout_add(100, latency_func, NULL);
pa_operation_unref(pa_stream_update_timing_info(stream, stream_update_timing_info_callback, NULL));
@@ -410,12 +411,14 @@
}
}
-static void create_stream(const char *name, const pa_sample_spec &ss, const pa_channel_map &cmap) {
+static void create_stream(const char *name, const char *description, const pa_sample_spec &ss, const pa_channel_map &cmap) {
char t[256];
pa_sample_spec nss;
g_free(device_name);
device_name = g_strdup(name);
+ g_free(device_description);
+ device_description = g_strdup(description);
nss.format = PA_SAMPLE_FLOAT32;
nss.rate = ss.rate;
@@ -439,7 +442,7 @@
if (!si)
return;
- create_stream(si->name, si->sample_spec, si->channel_map);
+ create_stream(si->name, si->description, si->sample_spec, si->channel_map);
}
static void context_get_sink_info_callback(pa_context *, const pa_sink_info *si, int is_last, void *) {
@@ -451,7 +454,7 @@
if (!si)
return;
- create_stream(si->monitor_source_name, si->sample_spec, si->channel_map);
+ create_stream(si->monitor_source_name, si->description, si->sample_spec, si->channel_map);
}
static void context_get_server_info_callback(pa_context *c, const pa_server_info*si, void *) {
@@ -511,61 +514,66 @@
int main(int argc, char *argv[]) {
pa_glib_mainloop *m;
- bool record;
+ bool record = false;
signal(SIGPIPE, SIG_IGN);
- Glib::OptionGroup og("PulseAudio Volume Meter", "Control the volume of your PulseAudio Sound Server");
-
- Glib::OptionEntry oe;
- oe.set_long_name("record");
- oe.set_description("Show Record Levels");
- og.add_entry(oe, record);
-
- Glib::OptionContext oc;
- oc.set_main_group(og);
-
- Gtk::Main kit(argc, argv, oc);
-
- mode = record ? RECORD : PLAYBACK;
-
- g_message("Starting in %s mode.", mode == RECORD ? "record" : "playback");
+ try {
+ Glib::OptionGroup og("PulseAudio Volume Meter", "Control the volume of your PulseAudio Sound Server");
+
+ Glib::OptionEntry oe;
+ oe.set_long_name("record");
+ oe.set_description("Show Record Levels");
+ og.add_entry(oe, record);
+
+ Glib::OptionContext oc;
+ oc.set_main_group(og);
+
+ Gtk::Main kit(argc, argv, oc);
+
+ mode = record ? RECORD : PLAYBACK;
+
+ g_message("Starting in %s mode.", mode == RECORD ? "record" : "playback");
+
+ /* Rather ugly and incomplete */
+ if (argc > 1)
+ device_name = g_strdup(argv[1]) ;
+ else {
+ char *e;
+ if ((e = getenv(mode == RECORD ? "PULSE_SOURCE" : "PULSE_SINK")))
+ device_name = g_strdup(e);
+ }
+
+ if (device_name)
+ g_message("Using device '%s'", device_name);
+
+ m = pa_glib_mainloop_new(g_main_context_default());
+ g_assert(m);
+
+ context = pa_context_new(pa_glib_mainloop_get_api(m), "PulseAudio Volume Meter");
+ g_assert(context);
+
+ pa_context_set_state_callback(context, context_state_callback, NULL);
+ pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL);
+
+ Gtk::Main::run();
+
+ if (stream)
+ pa_stream_unref(stream);
+ if (context)
+ pa_context_unref(context);
+
+ if (mainWindow)
+ delete mainWindow;
+
+ if(device_name)
+ g_free(device_name);
+
+ pa_glib_mainloop_free(m);
- /* Rather ugly and incomplete */
- if (argc > 1)
- device_name = g_strdup(argv[1]) ;
- else {
- char *e;
- if ((e = getenv(mode == RECORD ? "PULSE_SOURCE" : "PULSE_SINK")))
- device_name = g_strdup(e);
+ } catch (Glib::OptionError) {
+ g_message("Bad parameter");
}
-
- if (device_name)
- g_message("Using device '%s'", device_name);
-
- m = pa_glib_mainloop_new(g_main_context_default());
- g_assert(m);
-
- context = pa_context_new(pa_glib_mainloop_get_api(m), "PulseAudio Volume Meter");
- g_assert(context);
-
- pa_context_set_state_callback(context, context_state_callback, NULL);
- pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL);
-
- Gtk::Main::run();
-
- if (stream)
- pa_stream_unref(stream);
- if (context)
- pa_context_unref(context);
-
- if (mainWindow)
- delete mainWindow;
-
- if(device_name)
- g_free(device_name);
-
- pa_glib_mainloop_free(m);
return 0;
}
++++++ pavumeter-desktop-fix.diff ++++++
--- /var/tmp/diff_new_pack.O27530/_old 2007-10-31 17:12:39.000000000 +0100
+++ /var/tmp/diff_new_pack.O27530/_new 2007-10-31 17:12:39.000000000 +0100
@@ -1,11 +1,22 @@
---- src/pavumeter.desktop-dist 2007-06-13 16:06:55.000000000 +0200
-+++ src/pavumeter.desktop 2007-06-13 16:09:53.000000000 +0200
+--- src/pavumeter.desktop-dist 2007-10-31 16:07:40.000000000 +0100
++++ src/pavumeter.desktop 2007-10-31 16:07:49.000000000 +0100
@@ -4,7 +4,7 @@
- GenericName=Volume Meter
- Comment=Monitor the output or input volume
+ GenericName=Playback Volume Meter
+ Comment=Monitor the output volume
Exec=pavumeter
-Icon=audio-input-microphone
+Icon=pavumeter
StartupNotify=true
Type=Application
Categories=Application;AudioVideo;Audio;
+--- src/pavumeter-record.desktop-dist 2007-10-31 16:07:42.000000000 +0100
++++ src/pavumeter-record.desktop 2007-10-31 16:08:00.000000000 +0100
+@@ -4,7 +4,7 @@
+ GenericName=Capture Volume Meter
+ Comment=Monitor the input volume
+ Exec=pavumeter --record
+-Icon=audio-input-microphone
++Icon=pavumeter
+ StartupNotify=true
+ Type=Application
+ Categories=Application;AudioVideo;Audio;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package paprefs
checked in at Wed Oct 31 17:12:33 CET 2007.
--------
--- paprefs/paprefs.changes 2007-06-13 16:34:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/paprefs/paprefs.changes 2007-10-31 13:56:32.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Oct 31 16:14:03 CET 2007 - tiwai(a)suse.de
+
+- updated to version 0.9.6:
+ * rework UI
+ * add support to enable automatic zeroconf discovery
+ * automatic device combination
+ * i18n support
+
+-------------------------------------------------------------------
Old:
----
paprefs-0.9.5.tar.bz2
New:
----
paprefs-0.9.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ paprefs.spec ++++++
--- /var/tmp/diff_new_pack.o24264/_old 2007-10-31 17:11:00.000000000 +0100
+++ /var/tmp/diff_new_pack.o24264/_new 2007-10-31 17:11:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package paprefs (Version 0.9.5)
+# spec file for package paprefs (Version 0.9.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,13 +11,13 @@
# norootforbuild
Name: paprefs
-BuildRequires: gcc-c++ gconfmm-devel libglademm-devel pulseaudio-devel update-desktop-files
+BuildRequires: gcc-c++ gconfmm-devel intltool libglademm-devel pulseaudio-devel update-desktop-files
Summary: PulseAudio Preferences
-Version: 0.9.5
+Version: 0.9.6
Release: 1
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Utilities
-URL: http://0pointer.de/lennart/projects/paprefs/
+Url: http://0pointer.de/lennart/projects/paprefs/
Source: %{name}-%{version}.tar.bz2
Source1: paprefs.png
Patch: paprefs-desktop-fix.diff
@@ -51,11 +51,12 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
%suse_update_desktop_file %{name} AudioVideo SystemSetup Music
+%find_lang %{name}
%clean
test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(-,root,root)
%doc doc/README doc/README.html
%doc LICENSE
@@ -63,7 +64,12 @@
%{_datadir}/paprefs
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
-
%changelog
+* Wed Oct 31 2007 - tiwai(a)suse.de
+- updated to version 0.9.6:
+ * rework UI
+ * add support to enable automatic zeroconf discovery
+ * automatic device combination
+ * i18n support
* Wed Jun 13 2007 - tiwai(a)suse.de
- initial version: 0.9.5
++++++ paprefs-0.9.5.tar.bz2 -> paprefs-0.9.6.tar.bz2 ++++++
++++ 19836 lines of diff (skipped)
++++++ paprefs-desktop-fix.diff ++++++
--- /var/tmp/diff_new_pack.o24264/_old 2007-10-31 17:11:00.000000000 +0100
+++ /var/tmp/diff_new_pack.o24264/_new 2007-10-31 17:11:00.000000000 +0100
@@ -1,12 +1,11 @@
---- src/paprefs.desktop-dist 2007-06-13 16:34:03.000000000 +0200
-+++ src/paprefs.desktop 2007-06-13 16:34:21.000000000 +0200
+--- src/paprefs.desktop.in-dist 2007-10-31 16:16:12.000000000 +0100
++++ src/paprefs.desktop.in 2007-10-31 16:16:24.000000000 +0100
@@ -5,7 +5,7 @@
- GenericName=Sound server Preferences
- Comment=View and modify the configuration of the local sound server
+ _GenericName=Sound Server Preferences
+ _Comment=View and modify the configuration of the local sound server
Exec=paprefs
-Icon=preferences-desktop
+Icon=paprefs
StartupNotify=true
Type=Application
--Categories=Application;AudioVideo;Audio;
-+Categories=AudioVideo;SystemSetup;
+ Categories=Settings;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package Mesa
checked in at Wed Oct 31 17:10:53 CET 2007.
--------
--- Mesa/Mesa.changes 2007-08-13 03:07:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2007-10-31 09:46:45.935837000 +0100
@@ -1,0 +2,8 @@
+Wed Oct 31 08:53:24 CET 2007 - sndirsch(a)suse.de
+
+- updated to Mesa 7.0.2 RC1
+- obsoletes disable-libGL-warning.diff, i915-g33.diff and
+ i915tex-g33.diff
+- adjusted link-shared.diff and static.diff
+
+-------------------------------------------------------------------
Old:
----
disable-libGL-warning.diff
i915-g33.diff
i915tex-g33.diff
MesaDemos-7.0.1.tar.bz2
MesaLib-7.0.1.tar.bz2
New:
----
MesaDemos-7.0.2-rc1.tar.bz2
MesaLib-7.0.2-rc1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.Q17118/_old 2007-10-31 17:07:22.000000000 +0100
+++ /var/tmp/diff_new_pack.Q17118/_new 2007-10-31 17:07:22.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package Mesa (Version 7.0.1)
+# spec file for package Mesa (Version 7.0.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,17 +12,17 @@
Name: Mesa
BuildRequires: gcc-c++ libdrm-devel pkgconfig xorg-x11-devel
-URL: http://www.mesa3d.org
+Url: http://www.mesa3d.org
License: X11/MIT
Group: System/Libraries
Provides: xorg-x11-Mesa
Obsoletes: xorg-x11-Mesa
-Autoreqprov: on
-Version: 7.0.1
-Release: 6
+AutoReqProv: on
+Version: 7.0.2
+Release: 1
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.*
-Source: MesaLib-%{version}.tar.bz2
-Source1: MesaDemos-%{version}.tar.bz2
+Source: MesaLib-%{version}-rc1.tar.bz2
+Source1: MesaDemos-%{version}-rc1.tar.bz2
Source3: README.updates
Source4: manual-pages.tar.bz2
Source5: via.csh
@@ -30,12 +30,9 @@
Patch0: disable-sis_dri.diff
Patch1: dri_driver_dir.diff
Patch2: i915-crossbar.diff
-Patch3: disable-libGL-warning.diff
Patch4: libIndirectGL.diff
Patch5: static.diff
Patch6: link-shared.diff
-Patch7: i915-g33.diff
-Patch8: i915tex-g33.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -105,7 +102,7 @@
Brian Paul
%prep
-%setup -n %{name}-%{version} -b1 -b4
+%setup -n %{name}-%{version}-rc1 -b1 -b4
rm docs/README.MINGW32.orig
# make legal department happy (Bug #204110)
test -f src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
@@ -119,17 +116,10 @@
%patch0
%patch1
%patch2
-%patch3
%patch5
%ifarch %ix86 x86_64 ppc
%patch6
%endif
-pushd src/mesa/drivers/dri/i915
-%patch7
-popd
-pushd src/mesa/drivers/dri/i915tex
-%patch8
-popd
%build
@@ -156,19 +146,19 @@
%ifarch %ix86 ppc x86_64
%ifarch %ix86
make linux-dri-x86 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs}
-make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/%{_lib}/dri %{?jobs:-j %jobs}
make realclean
make linux-x86-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
%endif
%ifarch ppc
make linux-dri-ppc OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs}
-make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/%{_lib}/dri %{?jobs:-j %jobs}
make realclean
make linux-ppc-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
%endif
%ifarch x86_64
make linux-dri-x86-64 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri'\"'" %{?jobs:-j %jobs}
-make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri %{?jobs:-j %jobs}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/%{_lib}/dri %{?jobs:-j %jobs}
make realclean
make linux-x86-64-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
%endif
@@ -178,7 +168,7 @@
%else
make linux OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
-make install DESTDIR=$RPM_BUILD_ROOT/usr INSTALL_DIR=$RPM_BUILD_ROOT/usr DRI_DRIVER_INSTALL_DIR=$RPM_BUILD_ROOT/usr/%{_lib}/dri
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=/usr DRI_DRIVER_INSTALL_DIR=/usr/%{_lib}/dri
make realclean
make linux-static OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?jobs:-j %jobs}
%endif
@@ -267,6 +257,8 @@
/usr/include/GL/xmesa_xf86.h
/usr/%{_lib}/libGLU.so
/usr/%{_lib}/libOSMesa.so
+/usr/%{_lib}/pkgconfig/gl.pc
+/usr/%{_lib}/pkgconfig/glu.pc
%{_mandir}/man3/*
%files devel-static
@@ -274,8 +266,12 @@
/usr/%{_lib}/libGL.a
/usr/%{_lib}/libGLU.a
/usr/%{_lib}/libMesaGL.a
-
%changelog
+* Wed Oct 31 2007 - sndirsch(a)suse.de
+- updated to Mesa 7.0.2 RC1
+- obsoletes disable-libGL-warning.diff, i915-g33.diff and
+ i915tex-g33.diff
+- adjusted link-shared.diff and static.diff
* Mon Aug 13 2007 - sndirsch(a)suse.de
- disable-libGL-warning.diff:
* Just filters warnings about unsupported non-conformant visuals
++++++ link-shared.diff ++++++
--- /var/tmp/diff_new_pack.Q17118/_old 2007-10-31 17:07:22.000000000 +0100
+++ /var/tmp/diff_new_pack.Q17118/_new 2007-10-31 17:07:22.000000000 +0100
@@ -17,7 +17,7 @@
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
cd drivers/dri ; $(MAKE) install ; \
fi
-+ $(INSTALL) $(TOP)/$(LIB_DIR)/libmesa_private.* $(INSTALL_DIR)/$(LIB_DIR)
++ $(INSTALL) $(TOP)/$(LIB_DIR)/libmesa_private.* $(DESTDIR)/$(INSTALL_DIR)/$(LIB_DIR)
## NOT INSTALLED YET:
## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
@@ -34,7 +34,7 @@
@@ -77,7 +77,7 @@
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(TOP)/bin/mklib -noprefix -o $@ \
+ $(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
+ $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -Wl,--undefined -Wl,--allow-shlib-undefined
++++++ static.diff ++++++
--- /var/tmp/diff_new_pack.Q17118/_old 2007-10-31 17:07:22.000000000 +0100
+++ /var/tmp/diff_new_pack.Q17118/_new 2007-10-31 17:07:22.000000000 +0100
@@ -1,7 +1,6 @@
-Only in configs.orig/: linux-dri.orig
-diff -u -r configs.orig/linux-ppc-static configs/linux-ppc-static
---- configs.orig/linux-ppc-static 2006-07-31 11:07:44.000000000 +0200
-+++ configs/linux-ppc-static 2006-07-31 11:07:56.000000000 +0200
+diff -u configs.orig/linux-ppc-static configs/linux-ppc-static
+--- configs.orig/linux-ppc-static 2007-10-31 08:30:54.131367500 +0100
++++ configs/linux-ppc-static 2007-10-31 08:31:08.204247000 +0100
@@ -8,7 +8,3 @@
# Library names (actual file names)
@@ -10,10 +9,10 @@
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-diff -u -r configs.orig/linux-x86-64-static configs/linux-x86-64-static
---- configs.orig/linux-x86-64-static 2006-07-31 11:07:44.000000000 +0200
-+++ configs/linux-x86-64-static 2006-07-31 11:11:08.000000000 +0200
-@@ -8,16 +8,6 @@
+diff -u configs.orig/linux-static configs/linux-static
+--- configs.orig/linux-static 2007-10-31 08:30:54.275376500 +0100
++++ configs/linux-static 2007-10-31 08:31:08.376257750 +0100
+@@ -8,17 +8,9 @@
# Library names (actual file names)
GL_LIB_NAME = libGL.a
@@ -28,12 +27,13 @@
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
--APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-- $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
-diff -u -r configs.orig/linux-x86-static configs/linux-x86-static
---- configs.orig/linux-x86-static 2006-07-31 11:07:44.000000000 +0200
-+++ configs/linux-x86-static 2006-07-31 11:11:44.000000000 +0200
-@@ -8,16 +8,6 @@
+
+ # Need to specify all libraries we may need
+ APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
+diff -u configs.orig/linux-x86-64-static configs/linux-x86-64-static
+--- configs.orig/linux-x86-64-static 2007-10-31 08:30:54.387383500 +0100
++++ configs/linux-x86-64-static 2007-10-31 08:32:57.027048000 +0100
+@@ -8,15 +8,6 @@
# Library names (actual file names)
GL_LIB_NAME = libGL.a
@@ -48,11 +48,11 @@
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
--APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-- $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
---- configs/linux-static.orig 2006-12-02 21:29:56.556452204 +0100
-+++ configs/linux-static 2006-12-02 21:30:18.559452348 +0100
-@@ -8,17 +8,9 @@
+-APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
+diff -u configs.orig/linux-x86-static configs/linux-x86-static
+--- configs.orig/linux-x86-static 2007-10-31 08:30:54.463388250 +0100
++++ configs/linux-x86-static 2007-10-31 08:33:31.349193000 +0100
+@@ -8,15 +8,6 @@
# Library names (actual file names)
GL_LIB_NAME = libGL.a
@@ -67,6 +67,4 @@
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
-
- # Need to specify all libraries we may need
- APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm \
+-APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0