Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59bfe6c73953c09b0ec7d4a86e50367d65797e7f
commit 59bfe6c73953c09b0ec7d4a86e50367d65797e7f
Author: crazy <[EMAIL PROTECTED]>
Date: Mon Sep 10 19:09:04 2007 +0200
bmpx-0.40.3-1-i686
* Version bump
* added some patches to fix linking problems and other
* broken things ( see comment in FB )
diff --git a/source/xmultimedia-extra/bmpx/00-revert-liking-workarounds.patch
b/source/xmultimedia-extra/bmpx/00-revert-liking-workarounds.patch
new file mode 100644
index 0000000..ce7242a
--- /dev/null
+++ b/source/xmultimedia-extra/bmpx/00-revert-liking-workarounds.patch
@@ -0,0 +1,39 @@
+diff -Naur bmpx-0.40.3/src/mb-tagger.hh bmpx-0.40.3-p/src/mb-tagger.hh
+--- bmpx-0.40.3/src/mb-tagger.hh 2007-09-08 09:38:35.000000000 +0200
++++ bmpx-0.40.3-p/src/mb-tagger.hh 2007-09-10 11:10:27.000000000 +0200
+@@ -48,7 +48,6 @@
+ #include "library.hh"
+ #include "musicbrainz/mbxml-v2.hh"
+ #include "bmp/ui-types.hh"
+-#include "lastfm-types.hh"
+
+ using namespace Glib;
+
+diff -Naur bmpx-0.40.3/src/shell.cc bmpx-0.40.3-p/src/shell.cc
+--- bmpx-0.40.3/src/shell.cc 2007-09-08 09:38:35.000000000 +0200
++++ bmpx-0.40.3-p/src/shell.cc 2007-09-10 11:09:47.000000000 +0200
+@@ -152,10 +152,6 @@
+ #define PLAYER_SHELL_ACTION_BOOKMARKS "player-shell-action-bookmarks"
+ #define PLAYER_SHELL_ACTION_CREATE_BOOKMARK
"player-shell-action-create-bookmark"
+
+-namespace
+-{
+- const Bmp::DB::Variant dummy = double (2);
+-}
+
+ namespace Bmp
+ {
+diff -Naur bmpx-0.40.3/src/ui-part-jamendo.cc
bmpx-0.40.3-p/src/ui-part-jamendo.cc
+--- bmpx-0.40.3/src/ui-part-jamendo.cc 2007-09-08 09:38:35.000000000 +0200
++++ bmpx-0.40.3-p/src/ui-part-jamendo.cc 2007-09-10 11:10:49.000000000
+0200
+@@ -48,10 +48,6 @@
+ #define JAMENDO_ACTION_UI_PART_JAMENDO "jamendo-action-ui-part-jamendo"
+ #define JAMENDO_ACTION_UPDATE_DB "jamendo-action-update-db"
+
+-namespace
+-{
+- const Bmp::DB::Variant dummy = double (2);
+-}
+
+ namespace Bmp
+ {
diff --git a/source/xmultimedia-extra/bmpx/01-fw_builduser.patch
b/source/xmultimedia-extra/bmpx/01-fw_builduser.patch
new file mode 100644
index 0000000..c3ae454
--- /dev/null
+++ b/source/xmultimedia-extra/bmpx/01-fw_builduser.patch
@@ -0,0 +1,45 @@
+Index: build.h.in
+===================================================================
+--- build.h.in (Revision 11299)
++++ build.h.in (Arbeitskopie)
+@@ -2,7 +2,7 @@
+ #define _BUILD_H
+
+ #define BUILD_DATE "@BUILD_DATE@"
+-#define BUILD_BUILDUSER "@BUILD_USER@"
++#define BUILD_BUILDUSER "Frugalware Linux"
+ #define BUILD_ARCH "@BUILD_ARCH@"
+
+ #endif /* _BUILD_H */
+Index: src/preferences.cc
+===================================================================
+--- src/preferences.cc (Revision 11299)
++++ src/preferences.cc (Arbeitskopie)
+@@ -43,7 +43,6 @@
+ #ifdef HAVE_ALSA
+ # define ALSA_PCM_NEW_HW_PARAMS_API
+ # define ALSA_PCM_NEW_SW_PARAMS_API
+-
+ # include <alsa/global.h>
+ # include <alsa/asoundlib.h>
+ # include <alsa/pcm_plugin.h>
+@@ -109,7 +108,7 @@
+ return (gbyte_f % (size / 1024.)).str();
+ else
+ return (mbyte_f % size).str();
+- */
++ */
+ }
+
+ struct AudioSystem
+@@ -604,8 +603,8 @@
+ m_state_err = Gdk::Pixbuf::create_from_file( build_filename(
BMP_IMAGE_DIR_STOCK, "silk-exclamation.png") );
+
+ /* version string */
+- static boost::format version_f ("<span size='small'
color='#606060'>BMPx %s:%s-R%s (%s / %s)</span>");
+- std::string version = (version_f % PACKAGE_VERSION %
RV_LAST_CHANGED_DATE % RV_REVISION % BUILD_DATE % BUILD_BUILDUSER).str ();
++ static boost::format version_f ("<span size='small'
color='#606060'>BMPx %s Rev: %s ( %s )</span>");
++ std::string version = (version_f % PACKAGE_VERSION % RV_REVISION %
BUILD_BUILDUSER).str ();
+ dynamic_cast<Label*> (m_ref_xml->get_widget ("l_version"))->set_markup
(version);
+
+ m_ref_xml->get_widget ("cbox_audio_system", m_cbox_audio_system);
diff --git a/source/xmultimedia-extra/bmpx/02-configure.patch
b/source/xmultimedia-extra/bmpx/02-configure.patch
new file mode 100644
index 0000000..ee61836
--- /dev/null
+++ b/source/xmultimedia-extra/bmpx/02-configure.patch
@@ -0,0 +1,12 @@
+Index: configure.ac
+===================================================================
+--- configure.ac (Revision 11299)
++++ configure.ac (Arbeitskopie)
+@@ -835,6 +835,7 @@
+ echo
+ echo " C compiler flags.............: $CFLAGS"
+ echo " C++ compiler flags...........: $CXXFLAGS"
++echo " Linker flags.................: $LDFLAGS"
+ echo
+ echo " Documentation generation.....: $generate_documentation"
+ echo
diff --git a/source/xmultimedia-extra/bmpx/03-no-ggdb3-when-debug-is-off.patch
b/source/xmultimedia-extra/bmpx/03-no-ggdb3-when-debug-is-off.patch
new file mode 100644
index 0000000..f3ffed3
--- /dev/null
+++ b/source/xmultimedia-extra/bmpx/03-no-ggdb3-when-debug-is-off.patch
@@ -0,0 +1,49 @@
+Index: jnetlib/Makefile.am
+===================================================================
+--- jnetlib/Makefile.am (Revision 11299)
++++ jnetlib/Makefile.am (Arbeitskopie)
+@@ -1,7 +1,9 @@
++AUTOMAKE_OPTIONS = foreign
++
+ noinst_LTLIBRARIES = libjnetlib.la
+
+ libjnetlib_la_LDFLAGS = -pthread $(GLIB_LIBS) $(GLIBMM_LIBS) $(SIGC_LIBS)
$(GTK_LIBS)
+-libjnetlib_la_CXXFLAGS = -ggdb3 -s -O2 -Wall -DTHREAD_SAFE -D_THREAD_SAFE
-D_REENTRANT $(GLIB_CFLAGS) $(SIGC_CFLAGS) $(GLIBMM_CFLAGS) $(GTK_CFLAGS)
++libjnetlib_la_CXXFLAGS = -DTHREAD_SAFE -D_THREAD_SAFE -D_REENTRANT
$(GLIB_CFLAGS) $(SIGC_CFLAGS) $(GLIBMM_CFLAGS) $(GTK_CFLAGS)
+
+ libjnetlib_la_SOURCES = \
+ asyncdns.cpp \
+Index: src/parser/Makefile.am
+===================================================================
+--- src/parser/Makefile.am (Revision 11299)
++++ src/parser/Makefile.am (Arbeitskopie)
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = foreign
++
+ noinst_LTLIBRARIES = libbmpparser.la
+
+ libbmpparser_la_CXXFLAGS = \
+@@ -3,5 +5,5 @@
+ $(BOOST_FILESYSTEM_CFLAGS) $(GLIBMM_CFLAGS) $(XML_CFLAGS)
-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src
+
+-libbmpparser_la_LDFLAGS = -ggdb3 $(BOOST_FILESYSTEM_LIBS)
++libbmpparser_la_LDFLAGS = $(BOOST_FILESYSTEM_LIBS)
+
+ libbmpparser_la_SOURCES = \
+Index: src/musicbrainz/Makefile.am
+===================================================================
+--- src/musicbrainz/Makefile.am (Revision 11299)
++++ src/musicbrainz/Makefile.am (Arbeitskopie)
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = foreign
++
+ noinst_LTLIBRARIES = libbmpmusicbrainz.la
+
+ libbmpmusicbrainz_la_CXXFLAGS = \
+@@ -3,5 +5,5 @@
+ $(SOUP_CFLAGS) $(BOOST_FILESYSTEM_CFLAGS) $(GLIBMM_CFLAGS)
$(XML_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src
+
+-libbmpmusicbrainz_la_LDFLAGS = -ggdb3 $(BOOST_FILESYSTEM_LIBS) $(SOUP_LIBS)
++libbmpmusicbrainz_la_LDFLAGS = $(BOOST_FILESYSTEM_LIBS) $(SOUP_LIBS)
+
+ libbmpmusicbrainz_la_SOURCES = \
diff --git a/source/xmultimedia-extra/bmpx/FrugalBuild
b/source/xmultimedia-extra/bmpx/FrugalBuild
index c787673..dc2cca9 100644
--- a/source/xmultimedia-extra/bmpx/FrugalBuild
+++ b/source/xmultimedia-extra/bmpx/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: crazy <[EMAIL PROTECTED]>
pkgname=bmpx
-pkgver=0.40.1
+pkgver=0.40.3
basever=0.40
pkgrel=1
pkgdesc="A media player that features support for specifications like XDS DnD,
XSPF and DBus."
@@ -21,9 +21,16 @@ options=('scriptlet')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump
'http://bmpx.beep-media-player.org/site/Downloads#BMP_Source_Download'|grep -m1
'.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'"
-source=(http://files.beep-media-player.org/releases/$basever/$pkgname-$pkgver.tar.bz2
fw.patch)
-sha1sums=('c2d69fd8909d1d7a69ff13eee149084da9b802f0' \
- 'aab55940e8776ece490f3d1bc183dbed860ff246')
+source=(http://files.beep-media-player.org/releases/$basever/$pkgname-$pkgver.tar.bz2
\
+ 00-revert-liking-workarounds.patch \
+ 01-fw_builduser.patch \
+ 02-configure.patch \
+ 03-no-ggdb3-when-debug-is-off.patch)
+sha1sums=('9ae2e9342bbde9c10449fb12306efd7156054139' \
+ 'c0ecd2b222ec79e73c1e0981e54cfe0d42a07619' \
+ 'a8aabe4db10959e488ffdc38881c88a7cd72855e' \
+ '36a4a69332e0488b4c3b225859f062a70c93f980' \
+ '1ae574ae83b692518ebbcf2251b96b5d33d966e5')
subpkgs=("$pkgname-lastfm-firefox-plugin")
subdescs=("Firefox LastFM plugin for $pkgname")
@@ -33,7 +40,21 @@ subarchs=('i686 x86_64')
build()
{
- Fbuild \
+ Fcd
+ Fpatchall
+ Fautoreconf
+ unset MAKEFLAGS
+ # do _not_ remove that or it won't build
+ export CFLAGS="$(echo $CFLAGS|sed 's/-O2/-Os/')"
+ export CXXFLAGS="$(echo $CXXFLAGS|sed 's/-O2/-Os/')"
+ # this is because LD >=2.17 changed 'symbols in discarded sections'
+ # to a 'error' from a 'warning' and now some C++ apps may break ,
+ # this is one of them =)
+ # TODO: - work it out with nullptr for BMPx ( add some
--enable-ld-workaround option to configure ? )
+ # - revert that changes in LD and let it be a 'warning' again for
FW ? .. looks like the ld folks want to so
+ # - http://sourceware.org/ml/binutils/2007-09/msg00096.html
+ export LDFLAGS="$LDFLAGS -Wl,--noinhibit-exec"
+ Fconf \
--enable-hal \
--enable-sid \
--enable-modplug \
@@ -44,6 +65,8 @@ build()
--with-boost-iostreams="boost_iostreams-gcc42-mt" \
--with-tr1
##--enable-debug#
+ make || Fdie
+ Fmakeinstall
## broken symlink
Frm /usr/bin/bmp2
Fln /usr/bin/beep-media-player-2 /usr/bin/bmp2
diff --git a/source/xmultimedia-extra/bmpx/fw.patch
b/source/xmultimedia-extra/bmpx/fw.patch
deleted file mode 100644
index 99d91bd..0000000
--- a/source/xmultimedia-extra/bmpx/fw.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur bmpx-0.40.1/build.h bmpx-0.40.1-p/build.h
---- bmpx-0.40.1/build.h 2007-08-11 21:02:05.000000000 +0200
-+++ bmpx-0.40.1-p/build.h 2007-08-30 01:27:00.000000000 +0200
-@@ -1,8 +1,8 @@
- #ifndef _BUILD_H
- #define _BUILD_H
-
--#define BUILD_DATE "Sat Aug 11 21:02:05 CEST 2007"
--#define BUILD_BUILDUSER "[EMAIL PROTECTED]"
--#define BUILD_ARCH "Linux 2.6.20-16-generic i686"
-+#define BUILD_DATE ""
-+#define BUILD_BUILDUSER "Frugalware Linux"
-+#define BUILD_ARCH ""
-
- #endif /* _BUILD_H */
-diff -Naur bmpx-0.40.1/src/preferences.cc bmpx-0.40.1-p/src/preferences.cc
---- bmpx-0.40.1/src/preferences.cc 2007-08-11 20:41:51.000000000 +0200
-+++ bmpx-0.40.1-p/src/preferences.cc 2007-08-30 01:26:15.000000000 +0200
-@@ -604,8 +604,8 @@
- m_state_err = Gdk::Pixbuf::create_from_file( build_filename(
BMP_IMAGE_DIR_STOCK, "silk-exclamation.png") );
-
- /* version string */
-- static boost::format version_f ("<span size='small'
color='#606060'>BMPx %s:%s-R%s (%s / %s)</span>");
-- std::string version = (version_f % PACKAGE_VERSION %
RV_LAST_CHANGED_DATE % RV_REVISION % BUILD_DATE % BUILD_BUILDUSER).str ();
-+ static boost::format version_f ("<span size='small'
color='#606060'>BMPx %s:%s-R%s ( %s )</span>");
-+ std::string version = (version_f % PACKAGE_VERSION %
RV_LAST_CHANGED_DATE % RV_REVISION % BUILD_BUILDUSER).str ();
- dynamic_cast<Label*> (m_ref_xml->get_widget ("l_version"))->set_markup
(version);
-
- m_ref_xml->get_widget ("cbox_audio_system", m_cbox_audio_system);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
