Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=b43c0d8ee2d12ec68c29ce5068e3634a742ecbee

commit b43c0d8ee2d12ec68c29ce5068e3634a742ecbee
Author: crazy <[EMAIL PROTECTED]>
Date:   Thu Aug 30 02:19:06 2007 +0200

bmpx-0.40.1-1-i686
* Version bump
* pything subpkg gone
* added an patch to let bmpx report Frugalware as build user
* reworked depends and FB
* still some issues left but 0.3* is broken ..

diff --git a/source/xmultimedia-extra/bmpx/FrugalBuild 
b/source/xmultimedia-extra/bmpx/FrugalBuild
index bac7673..c787673 100644
--- a/source/xmultimedia-extra/bmpx/FrugalBuild
+++ b/source/xmultimedia-extra/bmpx/FrugalBuild
@@ -2,58 +2,48 @@
# Maintainer: crazy <[EMAIL PROTECTED]>

pkgname=bmpx
-pkgver=0.36.1
-basever=0.36
-pkgrel=2
+pkgver=0.40.1
+basever=0.40
+pkgrel=1
pkgdesc="A media player that features support for specifications like XDS DnD, 
XSPF and DBus."
url="http://bmpx.beep-media-player.org";
depends=('libsidplay' 'gamin' 'alsa-lib' 'dbus>=1.0.0-2' 'dbus-glib' 
'libglademm>=2.6.3-2' 'hal>=0.5.8.1' \
-        'faad2' 'faac' 'db>=4.5.20' 'neon>=0.26.2' 'libmusicbrainz' 'taglib' 
'freetype2' 'librsvg' 'startup-notification' \
+        'libsoup' 'icu' 'db>=4.5.20' 'libmodplug' 'sqlite3' 'taglib' 
'freetype2' 'librsvg' 'startup-notification' \
'gst-plugins-base>=0.10.10-4' 'gst-plugins-base-alsa>=0.10.10-4' 
'gst-plugins-base-oil>=0.10.10-4' \
-       'gst-plugins-base-cdparanoia>=0.10.10-4' 'boost>=1.34.0-4' 
'libofa>=0.9.3-2' 'fftw')
-makedepends=('flex' 'bison' 'cvs' 'gzip' 'zip' 'firefox' 'perl-xml' 'intltool')
+       'gst-plugins-base-cdparanoia>=0.10.10-4' 'boost>=1.34.0-4' 
'libofa>=0.9.3-2' 'cdparanoia' \
+       'libsexymm' 'libsexy' 'bzip2' 'e2fsprogs')
+makedepends=('flex' 'bison' 'gzip' 'zip' 'firefox' 'perl-xml' 'intltool')
rodepends=('gst-ffmpeg>=0.10.1-4' 'gst-plugins-good-flac>=0.10.4-5' 
'gst-plugins-ugly-mad>=0.10.4-2' \
'gst-plugins-bad-faad2>=0.10.3-5' 'gst-plugins-bad-musepack>=0.10.3-5' 
'gst-plugins-bad>=0.10.3-5' \
'gst-plugins-good>=0.10.4-5' 'gst-plugins-ugly>=0.10.4-2' 
'gst-plugins-bad-mms>=0.10.3-5' \
'gst-plugins-good-speex>=0.10.4-5' 'gst-plugins-ugly-sidplay>=0.10.4-2' 
'gst-plugins-base-theora>=0.10.10-4')
options=('scriptlet')
-Finclude python
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
 not_for_upstream_python.patch)
-sha1sums=('d1f798038add19b95f292e16cbfe88e91f02034a' \
-          'f8e940891a6d6ef03b697b22ce771df950d39ba6')
+source=(http://files.beep-media-player.org/releases/$basever/$pkgname-$pkgver.tar.bz2
 fw.patch)
+sha1sums=('c2d69fd8909d1d7a69ff13eee149084da9b802f0' \
+          'aab55940e8776ece490f3d1bc183dbed860ff246')

-subpkgs=("$pkgname-python" "$pkgname-lastfm-firefox-plugin")
-subdescs=("Python bindings for $pkgname" "Firefox LastFM plugin for $pkgname")
-subdepends=("$pkgname=$pkgver python" "$pkgname=$pkgver firefox")
-subgroups=('xapps-extra' 'xapps-extra')
-subarchs=('i686 x86_64' 'i686 x86_64')
+subpkgs=("$pkgname-lastfm-firefox-plugin")
+subdescs=("Firefox LastFM plugin for $pkgname")
+subdepends=("$pkgname=$pkgver firefox")
+subgroups=('xapps-extra')
+subarchs=('i686 x86_64')

build()
{
-        Fcd
-       ## =))
-       #export CFLAGS=""
-       #export CXXFLAGS=""
-       #export LDFLAGS=""
-        Fpatchall
-        Fautoreconf
-       Fmake \
-               BOOST_FILESYSTEM_LIBS="-lboost_filesystem-gcc42-mt" \
-               BOOST_REGEX_LIBS="-lboost_regex-gcc42-mt" \
+       Fbuild \
--enable-hal \
-               --enable-mp4v2 \
--enable-sid \
-                --enable-python \
-               --enable-ofa \
+               --enable-modplug \
--enable-sn \
--enable-sm \
-               --disable-moodriver \
-               --with-build-user="Frugalware Linux"
-               ##--enable-debug##
-       Fmakeinstall
+               --with-boost-filesystem="boost_filesystem-gcc42-mt" \
+               --with-boost-regex="boost_regex-gcc42-mt" \
+               --with-boost-iostreams="boost_iostreams-gcc42-mt" \
+               --with-tr1
+               ##--enable-debug#
## broken symlink
Frm /usr/bin/bmp2
Fln /usr/bin/beep-media-player-2 /usr/bin/bmp2
@@ -63,7 +53,6 @@ build()
cd $Fdestdir/usr/lib/firefox/extensions/{bc3572da-daf9-435d-a8a6-33cc20fe4533}
unzip -qqo bmp.xpi || Fdie
rm -f bmp.xpi || Fdie
-       Fsplit $pkgname-python usr/lib/python$_F_python_ver
Fsplit $pkgname-lastfm-firefox-plugin usr/lib/firefox
}

diff --git a/source/xmultimedia-extra/bmpx/fw.patch 
b/source/xmultimedia-extra/bmpx/fw.patch
new file mode 100644
index 0000000..99d91bd
--- /dev/null
+++ b/source/xmultimedia-extra/bmpx/fw.patch
@@ -0,0 +1,29 @@
+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);
diff --git a/source/xmultimedia-extra/bmpx/not_for_upstream_python.patch 
b/source/xmultimedia-extra/bmpx/not_for_upstream_python.patch
deleted file mode 100644
index 38c6524..0000000
--- a/source/xmultimedia-extra/bmpx/not_for_upstream_python.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur bmpx-0.32.0/bindings/python/Makefile.am 
bmpx-0.32.0-p/bindings/python/Makefile.am
---- bmpx-0.32.0/bindings/python/Makefile.am    2006-10-02 00:34:25.000000000 
+0200
-+++ bmpx-0.32.0-p/bindings/python/Makefile.am  2006-10-03 21:49:38.000000000 
+0200
-@@ -6,7 +6,7 @@
-       $(PYTHON) setup.py build
-
- install:
--      $(PYTHON) setup.py install
-+      $(PYTHON) setup.py install --prefix $(prefix) --root $(DESTDIR)
-
- clean:
-       $(PYTHON) setup.py clean
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to