Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=faaedabcd1133a489577523bd3e9b4343a1cd705
commit faaedabcd1133a489577523bd3e9b4343a1cd705
Author: crazy <[EMAIL PROTECTED]>
Date: Thu Sep 13 22:27:18 2007 +0200
bmpx-0.40.4-1-i686
* Version bump
* removed almost all workarounds , solved upstream :p
diff --git a/source/xmultimedia-extra/bmpx/00-revert-linking-workarounds.patch
b/source/xmultimedia-extra/bmpx/00-revert-linking-workarounds.patch
deleted file mode 100644
index ce7242a..0000000
--- a/source/xmultimedia-extra/bmpx/00-revert-linking-workarounds.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/FrugalBuild
b/source/xmultimedia-extra/bmpx/FrugalBuild
index 1ba221f..6e1638f 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.3
+pkgver=0.40.4
basever=0.40
pkgrel=1
pkgdesc="A media player that features support for specifications like XDS DnD,
XSPF and DBus."
@@ -20,14 +20,12 @@ rodepends=('gst-ffmpeg>=0.10.1-4'
'gst-plugins-good-flac>=0.10.4-5' 'gst-plugins
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/'"
+up2date="lynx -dump
'http://bmpx.beep-media-player.org/site/BMPx_Homepage'|grep -m1 '.tar.bz2'|sed
's/.*-\(.*\).t.*/\1/'"
source=(http://files.beep-media-player.org/releases/$basever/$pkgname-$pkgver.tar.bz2
\
- 00-revert-linking-workarounds.patch \
01-fw_builduser.patch \
02-configure.patch \
03-no-ggdb3-when-debug-is-off.patch)
-sha1sums=('9ae2e9342bbde9c10449fb12306efd7156054139' \
- 'c0ecd2b222ec79e73c1e0981e54cfe0d42a07619' \
+sha1sums=('046baeac32d116c54ae160a233e5066eaf781601' \
'a8aabe4db10959e488ffdc38881c88a7cd72855e' \
'36a4a69332e0488b4c3b225859f062a70c93f980' \
'1ae574ae83b692518ebbcf2251b96b5d33d966e5')
@@ -43,17 +41,13 @@ build()
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"
+ #export LDFLAGS="$LDFLAGS -Wl,--noinhibit-exec"
Fconf \
--enable-hal \
--enable-sid \
@@ -67,9 +61,6 @@ build()
##--enable-debug#
make || Fdie
Fmakeinstall
- ## broken symlink
- Frm /usr/bin/bmp2
- Fln /usr/bin/beep-media-player-2 /usr/bin/bmp2
## ff plugin
Fmkdir /usr/lib/firefox/extensions/{bc3572da-daf9-435d-a8a6-33cc20fe4533}
cp xpi/{*.xpi,*.manifest}
$Fdestdir/usr/lib/firefox/extensions/{bc3572da-daf9-435d-a8a6-33cc20fe4533}/
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
