Mailinglist Archive: opensuse-commit (1003 mails)
| < Previous | Next > |
commit xmms
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 01 Jun 2007 10:25:04 +0200
- Message-id: <20070601082504.B07BE67816D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xmms
checked in at Fri Jun 1 10:25:04 CEST 2007.
--------
--- GNOME/xmms/xmms.changes 2007-04-11 16:18:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/xmms/xmms.changes 2007-05-29 18:13:37.000000000 +0200
@@ -1,0 +2,17 @@
+Tue May 29 18:13:24 CEST 2007 - sbrabec@xxxxxxx
+
+- Removed obsolete Provides.
+- Removed obsolete parts of source code (#260218).
+- Split package conforming to #237351.
+- Updated to the latest CVS version:
+ * Playlist window improvements.
+ * Minor fixes.
+- Moved lconfig scriptlets to the correct package.
+- Removed obsolete parts of spec file.
+- Enabled esd output for s390* (can be used for remote output).
+- Fixed code excluding plugins from provided symbols.
+- Spec file cleanup.
+- Renamed xmms-lib to libxmms1 as required by library naming
+ conventions.
+
+-------------------------------------------------------------------
Old:
----
xmms-1.2.10-cvs-20050526.diff
xmms-1.2.10-cvs-release.diff
xmms-1.2.10-gentoo-m4-1.1.tar.bz2
New:
----
xmms-cvs-orig-addon-20070529.patch
xmms-cvs-patched-20070529.patch
xmms-cvs-po-20070529.tar.bz2
xmms-makefile-no-mpg123.patch
xmms-patch-source
xmms-translation-stubs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmms.spec ++++++
--- /var/tmp/diff_new_pack.K24974/_old 2007-06-01 10:23:28.000000000 +0200
+++ /var/tmp/diff_new_pack.K24974/_new 2007-06-01 10:23:28.000000000 +0200
@@ -11,29 +11,34 @@
# norootforbuild
Name: xmms
+# Patched code is built by default.
+# Use rpmbuild -D 'BUILD_ORIG 1' to build original code.
+# Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon.
BuildRequires: arts-devel esound-devel gnome-patch-translation gtk-devel imlib-devel libdrm-devel libjpeg-devel libmikmod-devel libxml-devel orbit-devel update-desktop-files
-%define splitmad 1
Summary: The extensible media player
Version: 1.2.10
-Release: 151
+Release: 170
URL: http://www.xmms.org/
License: GNU General Public License (GPL)
Group: Productivity/Multimedia/Sound/Players
-Provides: x11amp
-Autoreqprov: on
-Requires: xmms-lib = %version
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: %{name}-%{version}.tar.bz2
-NoSource: 0
-Source27: README.3dse
+Requires: lib%{name}1 = %{version}
+%if 0%{?BUILD_ORIG}
+Source: %{name}-%{version}.tar.bz2
+%else
+# WARNING: This is not a comment, but the real command to repack souce:
+#%(sh %{_sourcedir}/%{name}-patch-source %{name}-%{version}.tar.bz2)
+Source: %{name}-%{version}-patched.tar.bz2
+%endif
Source1: xmmsuse-1.0-2.tar.bz2
Source2: xmmsuse_blue-1.2-3.tar.bz2
Source3: xmms.desktop
Source4: xmms_enqueue.desktop
Source5: xmms_audio_cd.desktop
-Source6: %{name}-%{version}-gentoo-m4-1.1.tar.bz2
-Patch0: %{name}-%{version}-cvs-release.diff
-Patch1: %{name}-%{version}-cvs-20050526.diff
+Source6: xmms-cvs-po-20070529.tar.bz2
+Source7: xmms-patch-source
+Source27: README.3dse
+Patch: xmms-cvs-patched-20070529.patch
+Patch1: xmms-cvs-orig-addon-20070529.patch
Patch2: xmms-wchar.patch
Patch3: xmms-skins.patch
Patch4: xmms-output-auto.patch
@@ -64,11 +69,11 @@
Patch46: %{name}-%{version}-sigterm.diff
Patch47: %{name}-%{version}-vorbis.patch
Patch48: %{name}-bmp-loader-overflows.dpatch
-Provides: alsa-xmms
-Obsoletes: alsa-xmms
-%if %splitmad
-%define my_provides /tmp/my-provides
-%endif
+Patch49: %{name}-translation-stubs.patch
+Patch50: %{name}-makefile-no-mpg123.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%define _use_internal_dependency_generator 0
+%define my_provides %{_builddir}/%{?buildsubdir}/%{name}-requires
%description
Xmms is a media player for the X Window System that supports Winamp
@@ -160,12 +165,24 @@
Andrzej Kowalik <ak@xxxxxxx>
Colin Burn-Murdoch <colin@xxxxxxxxxxxxxxxxx>
-%package lib
+%package -n libxmms1
Summary: The extensible media player
Group: Productivity/Multimedia/Sound/Players
-Autoreqprov: on
+# Name in 10.2 and older:
+Provides: %{name}-lib = %{version}
+Obsoletes: %{name}-lib < %{version}
+%if 0%{?BUILD_ORIG}
+%if 0%{?BUILD_ORIG_ADDON}
+Provides: patched_subset
+%else
+Provides: lib%{name}1-orig-addon = %{version}
+Obsoletes: lib%{name}1-orig-addon < %{version}
+%endif
+%else
+Provides: patched_subset
+%endif
-%description lib
+%description -n libxmms1
Xmms is a media player for the X Window System that supports Winamp
skins and that has a sophisticated plugin system that allows for easy
extension of its abilities. Xmms is able to deal with all common types
@@ -255,14 +272,17 @@
Andrzej Kowalik <ak@xxxxxxx>
Colin Burn-Murdoch <colin@xxxxxxxxxxxxxxxxx>
-%if %splitmad
-%package lib-mad
+%if 0%{?BUILD_ORIG}
+%if 0%{?BUILD_ORIG_ADDON}
+%package -n libxmms1-orig-addon
Summary: The extensible media player
Group: Productivity/Multimedia/Sound/Players
-Autoreqprov: off
-
+Supplements: lib%{name}1
+# Name in 10.2 and older:
+Provides: %{name}-lib-mad = %{version}
+Obsoletes: %{name}-lib-mad < %{version}
-%description lib-mad
+%description -n libxmms1-orig-addon
Xmms is a media player for the X Window System that supports Winamp
skins and that has a sophisticated plugin system that allows for easy
extension of its abilities. Xmms is able to deal with all common types
@@ -353,10 +373,10 @@
Colin Burn-Murdoch <colin@xxxxxxxxxxxxxxxxx>
%endif
+%endif
%package devel
Summary: The extensible media player
Group: Productivity/Multimedia/Sound/Players
-Autoreqprov: on
Requires: %{name} = %{version} glib-devel gtk-devel
%description devel
@@ -393,9 +413,22 @@
%prep
%setup -q -a6
-gnome-patch-translation-prepare
-%patch0
+cp -a %{S:3} %{S:4} %{S:5} .
+%patch
+%if 0%{?BUILD_ORIG}
%patch1
+%else
+%patch50
+%endif
+# NOTE: en.po is a valid translation, which provides accented version of some strings.
+rename no nb po/no.*
+%patch32
+# Convert translations to UTF-8
+for file in $(grep -L charset=UTF-8 po/*.po) ; do
+ msgconv -t UTF-8 $file >$file.new
+ mv $file.new $file
+done
+gnome-patch-translation-prepare
%patch2
%patch3
%patch4
@@ -405,23 +438,26 @@
%patch19
rm Output/OSS/soundcard.h
%patch21
-%if %suse_version > 810
%patch22
-%endif
%patch24
+%if 0%{?BUILD_ORIG}
%patch25
+%endif
%patch26
%patch28
%patch31
-%patch32
%patch34
%patch35
%patch36
%patch37
+%if 0%{?BUILD_ORIG}
%patch38
%patch39
%patch40
%patch41
+%else
+%patch49
+%endif
%patch42
%patch43
%patch44
@@ -429,83 +465,48 @@
%patch46
%patch47
%patch48
-rename no nb po/no.*
-sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in
-sed "s/ no / /" po/LINGUAS > po/LINGUAS.tmp && mv po/LINGUAS.tmp po/LINGUAS
-# Convert translations to UTF-8
-for file in $(grep -L charset=UTF-8 po/*.po) ; do
- msgconv -t UTF-8 $file >$file.new
- mv $file.new $file
-done
gnome-patch-translation-update
+sed -i 's@Input/translation_stubs.h:1@Input/mpg123/configure.c:593@;s@Input/translation_stubs.h:2@Input/mpg123/configure.c:602@;s@Input/translation_stubs.h:3@Input/mpg123/fileinfo.c:507@' gnome-patch-translation/%{name}-patch.pot
%build
-%{suse_update_config -f . libxmms }
-M4_DIR=`pwd`/m4
-for i in . libxmms; do
- pushd $i
- rm acinclude.m4
- libtoolize --force --copy
- [ ! -f ltmain.sh ] && ln -s ../ltmain.sh
- aclocal --force -I $M4_DIR
- autoheader --force
- automake --gnu --add-missing --include-deps --force-missing --copy
- autoconf --force
- popd
-done
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-CCASFLAGS="-Wa,--noexecstack" \
- ./configure \
+gettextize -f ; mv ChangeLog~ ChangeLog
+autoreconf -f -i
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CCASFLAGS="-Wa,--noexecstack"
+%configure\
%ifarch %ix86
- --enable-simd \
+ --enable-simd\
%endif
- --enable-ipv6 \
- --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --datadir=%{_datadir} \
- --mandir=%{_mandir}
-make %{?jobs:-j %jobs}
+ --enable-ipv6\
+ --disable-static
+make %{?jobs:-j%jobs}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/xmms
-install -m 644 $RPM_SOURCE_DIR/README.3dse README AUTHORS COPYING ChangeLog FAQ INSTALL NEWS $RPM_BUILD_ROOT%{_docdir}/xmms
-%if %splitmad
-# exclude plugins from the provide-list
+install -m 644 $RPM_SOURCE_DIR/README.3dse README AUTHORS COPYING ChangeLog FAQ INSTALL NEWS TODO $RPM_BUILD_ROOT%{_docdir}/xmms
+# Exclude plugins from the provide-list:
cat << EOF > %{my_provides}
-grep -v /usr/%_lib/xmms | %{__find_provides}
+grep -v %{_libdir}/xmms | %{__find_provides}
EOF
chmod 755 %{my_provides}
%define __find_provides %{my_provides}
-%endif
-rm -f %{_infodir}/dir.bak.gz
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/xmms/Skins
-%if %ul_version == 0
-install -m 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/usr/share/xmms/Skins
-%endif
-# remove unwanted files
-rm $RPM_BUILD_ROOT%_libdir/libxmms.a
-%ifarch s390 s390x
-rm $RPM_BUILD_ROOT/usr/%_lib/xmms/Output/libesdout.{la,so}
-%endif
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/xmms/Skins
+install -m 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xmms/Skins
%find_lang %name
%suse_update_desktop_file -i xmms AudioVideo Player
-install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/applications/
-install -m 0644 %SOURCE5 $RPM_BUILD_ROOT/usr/share/applications/
-#%suse_update_desktop_file -i xmms_audio_cd AudioVideo Player
%suse_update_desktop_file -i xmms_audio_cd X-SuSE-CD Player
+%suse_update_desktop_file -i xmms_enqueue AudioVideo Player
mkdir -p $RPM_BUILD_ROOT/media/xmms_audio_cd
+rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.la
%clean
rm -rf $RPM_BUILD_ROOT
-%if %splitmad
-rm -f %{my_provides}
-%endif
-%post
+%post -n libxmms1
%run_ldconfig
-%postun
+%postun -n libxmms1
%run_ldconfig
%files
@@ -518,87 +519,76 @@
%{_docdir}/xmms/FAQ
%{_docdir}/xmms/NEWS
%{_docdir}/xmms/README*
-%dir /usr/share/xmms
-/usr/share/xmms/wmxmms.xpm
-%dir /usr/share/xmms/Skins
-%if %ul_version == 0
-/usr/share/xmms/Skins/*
-%endif
-/usr/bin/wmxmms
-/usr/bin/xmms
-/usr/share/applications/*.desktop
-/usr/share/pixmaps/xmms.png
-%_mandir/man1/wmxmms.1.gz
-%_mandir/man1/xmms.1.gz
+%{_docdir}/xmms/TODO
+%dir %{_datadir}/xmms
+%{_datadir}/xmms/wmxmms.xpm
+%dir %{_datadir}/xmms/Skins
+%{_datadir}/xmms/Skins/*
+%{_bindir}/*xmms
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/*.png
+%{_mandir}/man1/*.*
%dir /media/xmms_audio_cd
-%files lib -f %name.lang
+%files -n libxmms1 -f %{name}.lang
%defattr(-,root,root)
-%dir /usr/%_lib/xmms
-%dir /usr/%_lib/xmms/Effect
-/usr/%_lib/xmms/Effect/libecho.so
-/usr/%_lib/xmms/Effect/libstereo.so
-/usr/%_lib/xmms/Effect/libvoice.so
-%dir /usr/%_lib/xmms/General
-/usr/%_lib/xmms/General/libir.so
-/usr/%_lib/xmms/General/libjoy.so
-/usr/%_lib/xmms/General/libsong_change.so
-%dir /usr/%_lib/xmms/Input
-/usr/%_lib/xmms/Input/libcdaudio.so
-/usr/%_lib/xmms/Input/libmikmod.so
-/usr/%_lib/xmms/Input/libtonegen.so
-/usr/%_lib/xmms/Input/libwav.so
-/usr/%_lib/xmms/Input/libvorbis.so
-%dir /usr/%_lib/xmms/Output
-/usr/%_lib/xmms/Output/libOSS.so
-/usr/%_lib/xmms/Output/libdisk_writer.so
-/usr/%_lib/xmms/Output/libALSA.so
-%ifnarch s390 s390x
-/usr/%_lib/xmms/Output/libesdout.so
-%endif
-%dir /usr/%_lib/xmms/Visualization
-/usr/%_lib/xmms/Visualization/libbscope.so
-/usr/%_lib/xmms/Visualization/libogl_spectrum.so
-/usr/%_lib/xmms/Visualization/libsanalyzer.so
-/usr/%_lib/libxmms.so.*
-%if %splitmad
+%dir %{_libdir}/xmms
+%dir %{_libdir}/xmms/Effect
+%{_libdir}/xmms/Effect/libecho.so
+%{_libdir}/xmms/Effect/libstereo.so
+%{_libdir}/xmms/Effect/libvoice.so
+%dir %{_libdir}/xmms/General
+%{_libdir}/xmms/General/libir.so
+%{_libdir}/xmms/General/libjoy.so
+%{_libdir}/xmms/General/libsong_change.so
+%dir %{_libdir}/xmms/Input
+%{_libdir}/xmms/Input/libcdaudio.so
+%{_libdir}/xmms/Input/libmikmod.so
+%{_libdir}/xmms/Input/libtonegen.so
+%{_libdir}/xmms/Input/libwav.so
+%{_libdir}/xmms/Input/libvorbis.so
+%dir %{_libdir}/xmms/Output
+%{_libdir}/xmms/Output/libOSS.so
+%{_libdir}/xmms/Output/libdisk_writer.so
+%{_libdir}/xmms/Output/libALSA.so
+%{_libdir}/xmms/Output/libesdout.so
+%dir %{_libdir}/xmms/Visualization
+%{_libdir}/xmms/Visualization/libbscope.so
+%{_libdir}/xmms/Visualization/libogl_spectrum.so
+%{_libdir}/xmms/Visualization/libsanalyzer.so
+%{_libdir}/libxmms.so.*
+%if 0%{?BUILD_ORIG}
+%if 0%{?BUILD_ORIG_ADDON}
-%files lib-mad
+%files -n libxmms1-orig-addon
%defattr(-,root,root)
%endif
-/usr/%_lib/xmms/Input/libmpg123.so
-/usr/%_lib/xmms/Input/libmpg123.la
+%{_libdir}/xmms/Input/libmpg123.so
+%endif
%files devel
%defattr(-,root,root)
-/usr/include/xmms
-/usr/%_lib/xmms/Effect/libecho.la
-/usr/%_lib/xmms/Effect/libstereo.la
-/usr/%_lib/xmms/Effect/libvoice.la
-/usr/%_lib/xmms/General/libir.la
-/usr/%_lib/xmms/General/libjoy.la
-/usr/%_lib/xmms/General/libsong_change.la
-/usr/%_lib/xmms/Input/libcdaudio.la
-/usr/%_lib/xmms/Input/libmikmod.la
-/usr/%_lib/xmms/Input/libtonegen.la
-/usr/%_lib/xmms/Input/libwav.la
-/usr/%_lib/xmms/Input/libvorbis.la
-/usr/%_lib/xmms/Output/libOSS.la
-/usr/%_lib/xmms/Output/libdisk_writer.la
-/usr/%_lib/xmms/Output/libALSA.la
-%ifnarch s390 s390x
-/usr/%_lib/xmms/Output/libesdout.la
-%endif
-/usr/%_lib/xmms/Visualization/libbscope.la
-/usr/%_lib/xmms/Visualization/libogl_spectrum.la
-/usr/%_lib/xmms/Visualization/libsanalyzer.la
-/usr/bin/xmms-config
-# /usr/%_lib/libxmms.a
-/usr/%_lib/libxmms.la
-/usr/%_lib/libxmms.so
-/usr/share/aclocal/xmms.m4
+%{_bindir}/xmms-config
+%{_datadir}/aclocal/xmms.m4
+%{_includedir}/xmms
+%{_libdir}/libxmms.la
+%{_libdir}/libxmms.so
%changelog
+* Tue May 29 2007 - sbrabec@xxxxxxx
+- Removed obsolete Provides.
+- Removed obsolete parts of source code (#260218).
+- Split package conforming to #237351.
+- Updated to the latest CVS version:
+ * Playlist window improvements.
+ * Minor fixes.
+- Moved lconfig scriptlets to the correct package.
+- Removed obsolete parts of spec file.
+- Enabled esd output for s390* (can be used for remote output).
+- Fixed code excluding plugins from provided symbols.
+- Spec file cleanup.
+- Renamed xmms-lib to libxmms1 as required by library naming
+ conventions.
* Wed Apr 11 2007 - sbrabec@xxxxxxx
- Require just created libmikmod-devel instead of libmikmod.
* Fri Mar 30 2007 - sbrabec@xxxxxxx
++++++ xmms-1.2.10-id3convert.diff ++++++
--- /var/tmp/diff_new_pack.K24974/_old 2007-06-01 10:23:29.000000000 +0200
+++ /var/tmp/diff_new_pack.K24974/_new 2007-06-01 10:23:29.000000000 +0200
@@ -8,7 +8,7 @@
#include <string.h>
#include <stdlib.h>
#include <pthread.h>
-@@ -402,6 +403,14 @@
+@@ -400,6 +401,14 @@
return ext;
}
@@ -23,7 +23,7 @@
/*
* Function id3v1_to_id3v2 (v1, v2)
*
-@@ -413,10 +422,10 @@
+@@ -411,10 +420,10 @@
char *year;
struct id3v2tag_t *v2 = g_malloc0(sizeof (struct id3v2tag_t));
@@ -35,6 +35,6 @@
+ v2->artist = convert_id3v1_field(v1->artist, 30);
+ v2->album = convert_id3v1_field(v1->album, 30);
+ v2->comment = convert_id3v1_field(v1->u.v1_0.comment, 30);
- v2->genre = g_strstrip(g_strdup(get_id3_genre(v1->genre)));
+ v2->genre = g_strstrip(g_strdup(mpg123_get_id3_genre(v1->genre)));
year = g_strndup(v1->year, 4);
++++++ xmms-1.2.10-nb.patch ++++++
--- /var/tmp/diff_new_pack.K24974/_old 2007-06-01 10:23:29.000000000 +0200
+++ /var/tmp/diff_new_pack.K24974/_new 2007-06-01 10:23:29.000000000 +0200
@@ -1,11 +1,17 @@
--- configure.in
+++ configure.in
-@@ -260,7 +260,7 @@
- dnl This is just a copy of po/LINGUAS and is here to avoid breaking
- dnl compatibility with automake 1.4
-
+@@ -296,7 +296,7 @@
+ dnl *** This is just a copy of po/LINGUAS and is here to avoid breaking
+ dnl *** compatibility with automake 1.4
+ dnl ***
-ALL_LINGUAS="af az be bg bs ca cs cy da de el en en_GB eo es et eu fi fr ga gl hr hu id it ja ka ko lt lv mk ms nn nl no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tg th tr uk uz vi wa zh_CN zh_TW"
+ALL_LINGUAS="af az be bg bs ca cs cy da de el en en_GB eo es et eu fi fr ga gl hr hu id it ja ka ko lt lv mk ms nn nl nb pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tg th tr uk uz vi wa zh_CN zh_TW"
AM_GNU_GETTEXT
- AM_GNU_GETTEXT_VERSION(0.12)
+
+--- po/LINGUAS
++++ po/LINGUAS
+@@ -1,2 +1,2 @@
+-af az be bg bs ca cs cy da de el en en_GB eo es et eu fi fr ga gl hr hu id it ja ka ko lt lv mk ms nn nl no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tg th tr uk uz vi wa zh_CN zh_TW
++af az be bg bs ca cs cy da de el en en_GB eo es et eu fi fr ga gl hr hu id it ja ka ko lt lv mk ms nn nl nb pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tg th tr uk uz vi wa zh_CN zh_TW
+
++++++ xmms_audio_cd.desktop ++++++
--- GNOME/xmms/xmms_audio_cd.desktop 2005-11-08 14:51:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/xmms/xmms_audio_cd.desktop 2007-05-29 15:14:48.000000000 +0200
@@ -1,16 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
-BinaryPattern=
+Icon=xmms
+Name=XMMS CD
GenericName=Play CD with Multimedia Player
GenericName[cs]=Přehrát CD přehrávačem multimédií
Exec=xmms /media/xmms_audio_cd
-Icon=xmms
-Name=XMMS CD
-Path=
-SwallowExec=
-SwallowTitle=
-Terminal=0
-TerminalOptions=
+Terminal=false
Type=Application
-X-KDE-StartupNotify=false
-X-DCOP-ServiceType=None
+StartupNotify=false
++++++ xmms-bmp-loader-overflows.dpatch ++++++
--- GNOME/xmms/xmms-bmp-loader-overflows.dpatch 2007-03-30 16:48:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/xmms/xmms-bmp-loader-overflows.dpatch 2007-05-29 12:04:14.000000000 +0200
@@ -19,10 +19,10 @@
+#define UINT32_MAX 0xffffffffU
+#endif
+
- typedef struct tagRGBQUAD
+ struct rgb_quad
{
guchar rgbBlue;
-@@ -184,7 +190,7 @@
+@@ -183,7 +189,7 @@
}
else if (bitcount != 24 && bitcount != 16 && bitcount != 32)
{
@@ -31,10 +31,10 @@
ncols = offset - headSize - 14;
if (headSize == 12)
-@@ -200,10 +206,18 @@
- }
- }
+@@ -203,6 +209,14 @@
fseek(file, offset, SEEK_SET);
+ buffer = g_malloc(imgsize);
+ fread(buffer, imgsize, 1, file);
+ /* verify buffer size */
+ if (!h || !w ||
+ w > (((UINT32_MAX - 3) / 3) / h) ||
@@ -43,11 +43,6 @@
+ fclose(file);
+ return NULL;
+ }
-+ data = g_malloc0((w * 3 * h) + 3); /* +3 is just for safety */
- buffer = g_malloc(imgsize);
- fread(buffer, imgsize, 1, file);
- fclose(file);
-- data = g_malloc0((w * 3 * h) + 3); /* +3 is just for safety */
+ data = g_malloc0((w * 3 * h) + 3); /* +3 is just for safety */
if (bitcount == 1)
- read_1b_rgb(buffer, imgsize, data, w, h, rgb_quads);
++++++ xmms-cvs-orig-addon-20070529.patch ++++++
++++ 3788 lines (skipped)
++++++ xmms-cvs-patched-20070529.patch ++++++
++++ 35036 lines (skipped)
++++++ xmms.desktop ++++++
--- GNOME/xmms/xmms.desktop 2005-11-08 14:51:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/xmms/xmms.desktop 2007-05-29 15:13:22.000000000 +0200
@@ -1,6 +1,20 @@
[Desktop Entry]
-Encoding=UTF-8
-BinaryPattern=
+Name=XMMS
+Name[af]=Xmms
+Name[vi]=XMMS
+Comment=X Multimedia System
+Comment[az]=X Multimedya Sistemi
+Comment[ca]=Sistema Multimèdia per a X
+Comment[cs]=Multimediální přehrávač
+Comment[es]=Sistema Multimedia para X
+Comment[gl]=Sistema Multimedia para X
+Comment[hr]=X Multimedijski Sustav
+Comment[nn]=X Multimedia-system
+Comment[pt_BR]=X Multimedia System
+Comment[ro]=X MultiMedia Sistem
+Comment[th]=ระบบมัลติมีเดียบน X
+Comment[tr]=X Multimedya Sistem
+Comment[zh_TW]=X 多媒體系統
GenericName=Multimedia Player
GenericName[af]=Multimedia Speler
GenericName[bg]=Плеар за мултимедийни файлове
@@ -48,22 +62,14 @@
GenericName[tr]=Çoklu Ortam Yürütücüsü
GenericName[uk]=Програвач файлів мультимедія
GenericName[ven]=Tshitambi tsha Zwimvumvusi
-GenericName[vi]=Trình chơi nhạc đa phương tiện
+GenericName[vi]=Trình chơi nhạc đa phương tiện
GenericName[xh]=Umdlali we Multimedia
GenericName[zh_CN]=多媒体播放器
GenericName[zh_TW]=多媒體播放程式
GenericName[zu]=Umdlali wonozindaba abaningi
Exec=xmms %U
Icon=xmms
-MimeType=audio/x-mp3;audio/x-mod;audio/x-wav;application/x-ogg;
-Name=XMMS
-Name[af]=Xmms
-Name[vi]=XMMS
-Path=
-SwallowExec=
-SwallowTitle=
-Terminal=0
-TerminalOptions=
+MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;
+Terminal=false
Type=Application
-X-KDE-StartupNotify=false
-X-DCOP-ServiceType=None
+StartupNotify=false
++++++ xmms_enqueue.desktop ++++++
--- GNOME/xmms/xmms_enqueue.desktop 2005-11-08 14:51:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/xmms/xmms_enqueue.desktop 2007-05-29 15:14:04.000000000 +0200
@@ -1,5 +1,50 @@
[Desktop Entry]
-Encoding=UTF-8
+Name=Enqueue in XMMS
+Name[af]=Enqueue in Xmms
+Name[az]=XMMSdə Çal
+Name[be]=Дадаць у чаргу XMMS
+Name[bs]=Dodaj u XMMS
+Name[ca]=Encua en el XMMS
+Name[cs]=Zařazení skladby do XMMS
+Name[da]=Sæt i kø i XMMS
+Name[de]=XMMS-Warteschlange
+Name[el]=Στην ουρά του XMMS
+Name[eo]=Enqueue en XMMS
+Name[es]=Encolar en XMMS
+Name[et]=XMMS Enqueue
+Name[eu]=XMMS-ean sartu
+Name[fa]=صف شده در XMMS
+Name[fr]=Mettre dans la liste de lecture XMMS
+Name[hr]=Dodaj u XMMS listu pjesama
+Name[hu]=XMMS sor
+Name[it]=Metti in coda in XMMS
+Name[ja]=XMMSに登録
+Name[lv]=Ierindot XMMS
+Name[mk]=XMMS листа
+Name[mn]=XMMS-дараалал
+Name[mt]=Żid mal-XMMS
+Name[nb]=Legg i køen til XMMS
+Name[nl]=In XMMS-speellijst plaatsen
+Name[nn]=Legg i XMMS-spelelista
+Name[nso]=Enqueue kago XMMS
+Name[pl]=Kolejkowanie XMMS
+Name[pt]=Pôr na lista do XMMS
+Name[pt_BR]=Colocar na lista do XMMS
+Name[ro]=Adaugă la lista XMMS
+Name[ru]=Введение в XMMS
+Name[se]=Lasit XMMS-čuojahanlistui
+Name[sk]=Enqueue v XMMS
+Name[sl]=Uvrsti v XMMS
+Name[sr]=Dodaj u XMMS
+Name[sv]=Köa i XMMS
+Name[ta]=XMMSø Å⨺ôÀÎòÐ
+Name[tr]=XMMS'de sıraya ekle
+Name[uk]=В чергу до XMMS
+Name[vi]=Xếp vào XMMS
+Name[xh]=Folisa kwi XMMS
+Name[zh_CN]=加入XMMS队列
+Name[zh_TW]=加入 XMMS 播放列表
+Name[zu]=Lindela kulayini we-XMMS
GenericName=Playlist Tool
GenericName[af]=Liedjielys Program
GenericName[bg]=Инструмент за Списък на изпълнение
@@ -54,56 +99,9 @@
GenericName[zu]=Ithuluzi Loluhlu lokudlala
Exec=xmms -e -p %f
Icon=xmms
-MimeType=audio/x-mp3;audio/x-mod;audio/x-wav;audio/x-mpegurl;audio/x-scpls;
-Name=Enqueue in XMMS
-Name[af]=Enqueue in Xmms
-Name[az]=XMMSdə Çal
-Name[be]=Дадаць у чаргу XMMS
-Name[bs]=Dodaj u XMMS
-Name[ca]=Encua en el XMMS
-Name[cs]=Zařazení skladby do XMMS
-Name[da]=Sæt i kø i XMMS
-Name[de]=XMMS-Warteschlange
-Name[el]=Στην ουρά του XMMS
-Name[eo]=Enqueue en XMMS
-Name[es]=Encolar en XMMS
-Name[et]=XMMS Enqueue
-Name[eu]=XMMS-ean sartu
-Name[fa]=صف شده در XMMS
-Name[fr]=Mettre dans la liste de lecture XMMS
-Name[hr]=Dodaj u XMMS listu pjesama
-Name[hu]=XMMS sor
-Name[it]=Metti in coda in XMMS
-Name[ja]=XMMSに登録
-Name[lv]=Ierindot XMMS
-Name[mk]=XMMS листа
-Name[mn]=XMMS-дараалал
-Name[mt]=Żid mal-XMMS
-Name[nb]=Legg i køen til XMMS
-Name[nl]=In XMMS-speellijst plaatsen
-Name[nn]=Legg i XMMS-spelelista
-Name[nso]=Enqueue kago XMMS
-Name[pl]=Kolejkowanie XMMS
-Name[pt]=Pôr na lista do XMMS
-Name[pt_BR]=Colocar na lista do XMMS
-Name[ro]=Adaugă la lista XMMS
-Name[ru]=Введение в XMMS
-Name[se]=Lasit XMMS-čuojahanlistui
-Name[sk]=Enqueue v XMMS
-Name[sl]=Uvrsti v XMMS
-Name[sr]=Dodaj u XMMS
-Name[sv]=Köa i XMMS
-Name[ta]=XMMSø Å⨺ôÀÎòÐ
-Name[tr]=XMMS'de sıraya ekle
-Name[uk]=В чергу до XMMS
-Name[vi]=Xếp vào XMMS
-Name[xh]=Folisa kwi XMMS
-Name[zh_CN]=加入XMMS队列
-Name[zh_TW]=加入 XMMS 播放列表
-Name[zu]=Lindela kulayini we-XMMS
-Path=
-Terminal=0
+MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;
+Terminal=false
Type=Application
NoDisplay=true
-X-KDE-StartupNotify=false
+StartupNotify=false
++++++ xmms-makefile-no-mpg123.patch ++++++
--- Input/Makefile.am
+++ Input/Makefile.am
@@ -1,3 +1,3 @@
-ALL_PLUGINS = wav mpg123 mikmod cdaudio tonegen vorbis
+ALL_PLUGINS = wav mikmod cdaudio tonegen vorbis
SUBDIRS = @INPUT_PLUGINS@
--- configure.in
+++ configure.in
@@ -640,7 +640,6 @@
Output/alsa/Makefile
Input/Makefile
Input/wav/Makefile
-Input/mpg123/Makefile
Input/mikmod/Makefile
Input/cdaudio/Makefile
Input/tonegen/Makefile
--- po/POTFILES.in
+++ po/POTFILES.in
@@ -19,11 +19,6 @@
Input/cdaudio/http.c
Input/mikmod/drv_xmms.c
Input/mikmod/plugin.c
-Input/mpg123/common.c
-Input/mpg123/configure.c
-Input/mpg123/fileinfo.c
-Input/mpg123/http.c
-Input/mpg123/mpg123.c
Input/tonegen/tonegen.c
Input/vorbis/configure.c
Input/vorbis/fileinfo.c
++++++ xmms-translation-stubs.patch ++++++
--- Input/translation_stubs.h
+++ Input/translation_stubs.h
@@ -0,0 +1,3 @@
+N_("Override default ID3V2 encoding")
+N_("Encoding name:")
+N_("CCITT J.17")
--- po/POTFILES.in
+++ po/POTFILES.in
@@ -20,6 +20,7 @@
Input/mikmod/drv_xmms.c
Input/mikmod/plugin.c
Input/tonegen/tonegen.c
+Input/translation_stubs.h
Input/vorbis/configure.c
Input/vorbis/fileinfo.c
Input/vorbis/http.c
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |