From a0f71c02b37d28a471077f8445c0ca6d9fc96b98 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 12 Aug 2007 23:13:06 +0000 Subject: Update to 0.40.1: 0.40.1: This is a corrective release to the 0.40.0 release. A bug in which the library would not update changed files on a rescan was fixed. MB metadata reading was made fully compliant with the latest specifications. The dependency on libmp4v2 was dropped due to problems, and appropriate code was put in place instead. The preferences dialog was made GNOME HIG compliant. 0.40.0: A rewrite of the library backend, reorganization of the UI, improved Last.fm backend and tighter integration of Last.fm within the entire application, enhanced and debugged Podcast backend with newly added support for video podcasts using Gstreamer, initial Jamendo support, and a universal bookmarking system. The stability of the 0.40 series is incomparably higher than the 0.36 versions. The application's usability was also improved to a great degree. --- audio/bmpx/Makefile | 58 +++++++---------------- audio/bmpx/PLIST | 110 ++++++++++++++++++++++++++------------------ audio/bmpx/distinfo | 12 ++--- audio/bmpx/patches/patch-aa | 12 ----- audio/bmpx/patches/patch-ab | 13 ------ audio/bmpx/patches/patch-ac | 13 ------ audio/bmpx/patches/patch-ad | 32 ------------- 7 files changed, 86 insertions(+), 164 deletions(-) delete mode 100644 audio/bmpx/patches/patch-aa delete mode 100644 audio/bmpx/patches/patch-ab delete mode 100644 audio/bmpx/patches/patch-ac delete mode 100644 audio/bmpx/patches/patch-ad diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile index d3777d739c2..189638b5d10 100644 --- a/audio/bmpx/Makefile +++ b/audio/bmpx/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2007/06/05 05:37:20 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2007/08/12 23:13:06 wiz Exp $ # -DISTNAME= bmpx-0.36.1 -PKGREVISION= 4 +DISTNAME= bmpx-0.40.1 CATEGORIES= audio -MASTER_SITES= http://files.beep-media-player.org/releases/0.36/ +MASTER_SITES= http://files.beep-media-player.org/releases/0.40/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -16,58 +15,35 @@ DEPENDS+= zip-[0-9]*:../../archivers/zip GNU_CONFIGURE= yes USE_DIRS+= xdg-1.2 kde3-1.0 USE_LANGUAGES= c c++ -USE_TOOLS+= bison gmake intltool msgfmt pkg-config +USE_TOOLS+= gmake intltool msgfmt pkg-config USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -CONFIGURE_ARGS+= --enable-mp4v2 -CONFIGURE_ARGS+= --with-mp4v2-dir=${LOCALBASE} CONFIGURE_ENV+= BOOST_REGEX_LIBS=-lboost_regex-mt CPPFLAGS+= -I${LOCALBASE}/include/cdparanoia -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" -CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0 -.endif - -.if ${OPSYS} != "DragonFly" -SQLITE_PTHREAD= ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -MAKE_ENV+= SQLITE_PTHREAD=${SQLITE_PTHREAD:Q} -.endif - -BUILDLINK_API_DEPENDS.cairomm+= cairomm>=0.6.0 -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0 -BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.8.3 -BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.1 -BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.9 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0 -BUILDLINK_API_DEPENDS.gtkmm+= gtkmm>=2.8.0 -BUILDLINK_API_DEPENDS.libglademm+= libglademm>=2.6.0 -BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.12.6nb1 -BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.1.1 -BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8 -BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4 - .include "../../audio/cdparanoia/buildlink3.mk" .include "../../audio/libofa/buildlink3.mk" +BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4 .include "../../audio/taglib/buildlink3.mk" -.include "../../audio/musicbrainz/buildlink3.mk" +.include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" +BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.8.3 .include "../../devel/glibmm/buildlink3.mk" +BUILDLINK_API_DEPENDS.libglademm+= libglademm>=2.6.0 .include "../../devel/libglademm/buildlink3.mk" -.include "../../graphics/cairomm/buildlink3.mk" +BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.14.0 +.include "../../devel/libsexymm/buildlink3.mk" .include "../../graphics/librsvg2/buildlink3.mk" -.include "../../multimedia/libmp4v2/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../www/neon/buildlink3.mk" +.include "../../net/libsoup-devel/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 .include "../../x11/gtk2/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtkmm+= gtkmm>=2.10.0 .include "../../x11/gtkmm/buildlink3.mk" +BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8 .include "../../x11/startup-notification/buildlink3.mk" -.include "../../mk/fam.buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" +BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.9 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.11 .include "../../multimedia/gstreamer0.10/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/bmpx/PLIST b/audio/bmpx/PLIST index 8c4b45b9ad2..fc611267cb1 100644 --- a/audio/bmpx/PLIST +++ b/audio/bmpx/PLIST @@ -1,31 +1,25 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/09 21:04:00 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/08/12 23:13:06 wiz Exp $ bin/beep-media-player-2 bin/bmp-enqueue-files-2.0 bin/bmp-enqueue-uris-2.0 bin/bmp-play-files-2.0 bin/bmp-play-lastfm-2.0 bin/bmp2 -include/bmp-2.0/bmp/base_types.hh include/bmp-2.0/bmp/bmp.hh -include/bmp-2.0/bmp/database_types.hh include/bmp-2.0/bmp/dbus.hh -include/bmp-2.0/bmp/library_types.hh -lib/bmpx/plugins/taglib/libtaglib_plugin_audible.la +lib/bmpx/plugins/taglib/libtaglib_plugin_asf.la lib/bmpx/plugins/taglib/libtaglib_plugin_flac.la lib/bmpx/plugins/taglib/libtaglib_plugin_mp3.la lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.la lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.la lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.la -lib/bmpx/plugins/taglib/libtaglib_plugin_rmff.la -lib/bmpx/plugins/taglib/libtaglib_plugin_wma.la lib/bmpx/plugins/vfs/container/libcontainer_folder.la lib/bmpx/plugins/vfs/container/libcontainer_m3u.la -lib/bmpx/plugins/vfs/container/libcontainer_mlq.la lib/bmpx/plugins/vfs/container/libcontainer_pls.la -lib/bmpx/plugins/vfs/container/libcontainer_query.la lib/bmpx/plugins/vfs/container/libcontainer_xspf.la lib/bmpx/plugins/vfs/transport/libtransport_file.la lib/bmpx/plugins/vfs/transport/libtransport_http.la +lib/libbmp_id3v2_reader.la lib/pkgconfig/bmp-2.0.pc libexec/beep-media-player-2-bin libexec/beep-media-player-2-sentinel @@ -34,21 +28,21 @@ share/applications/bmp-2.0-offline.desktop share/applications/bmp-2.0.desktop share/applications/bmp-enqueue-2.0.desktop share/applications/bmp-play-2.0.desktop -share/bmpx/data/GPL.txt share/bmpx/glade/dialog-add-podcast.glade +share/bmpx/glade/dialog-equalizer.glade share/bmpx/glade/dialog-export.glade share/bmpx/glade/dialog-filebrowser.glade -share/bmpx/glade/dialog-filelist.glade -share/bmpx/glade/dialog-gaim-send-file.glade share/bmpx/glade/dialog-gsterror.glade share/bmpx/glade/dialog-lastfm-recommend.glade -share/bmpx/glade/dialog-lyrics.glade +share/bmpx/glade/dialog-lastfm-tag.glade +share/bmpx/glade/dialog-play-uri.glade share/bmpx/glade/dialog-progress.glade -share/bmpx/glade/library-ui-create-collection.glade +share/bmpx/glade/dialog-simple-entry.glade +share/bmpx/glade/dialog-simple-progress.glade +share/bmpx/glade/dialog-track-details.glade share/bmpx/glade/library-ui-modify-import.glade -share/bmpx/glade/library-ui-relocate-album.glade -share/bmpx/glade/main-ui.glade -share/bmpx/glade/preferences-ui.glade +share/bmpx/glade/main.glade +share/bmpx/glade/preferences.glade share/bmpx/icons/themes/darksphere/icon_player_128.png share/bmpx/icons/themes/darksphere/icon_player_16.png share/bmpx/icons/themes/darksphere/icon_player_32.png @@ -120,16 +114,14 @@ share/bmpx/icons/themes/tango/icon_streams_32.png share/bmpx/icons/themes/tango/icon_streams_48.png share/bmpx/icons/themes/tango/icon_streams_64.png share/bmpx/icons/tray-icons/tray-icon-default.png -share/bmpx/icons/tray-icons/tray-icon-exit.png share/bmpx/icons/tray-icons/tray-icon-paused.png share/bmpx/icons/tray-icons/tray-icon-playing.png +share/bmpx/images/audio-default-no-background.png share/bmpx/images/audio-default.png -share/bmpx/images/audio-empty.png -share/bmpx/images/audio-multiple.png -share/bmpx/images/blue-speaker.png share/bmpx/images/cdda/audiocd-big.png share/bmpx/images/cdda/audiocd-unplayable.png share/bmpx/images/collections/collection.png +share/bmpx/images/cover-frame.png share/bmpx/images/hal/dev-cdrom.png share/bmpx/images/hal/dev-volume-1394.png share/bmpx/images/hal/dev-volume-ide.png @@ -157,30 +149,27 @@ share/bmpx/images/lastfm/lastfm-artist.png share/bmpx/images/lastfm/lastfm-friend.png share/bmpx/images/lastfm/lastfm-mainuser.png share/bmpx/images/lastfm/lastfm-neighbour.png -share/bmpx/images/lastfm/lastfm-net-idle.png -share/bmpx/images/lastfm/lastfm-net-rx.png -share/bmpx/images/lastfm/lastfm-net-tx.png +share/bmpx/images/lastfm/lastfm-recommended-radio.png share/bmpx/images/lastfm/lastfm-station-small.png share/bmpx/images/lastfm/lastfm-station.png share/bmpx/images/lastfm/lastfm-tag.png share/bmpx/images/lastfm/lastfm-track.png share/bmpx/images/lastfm/lastfm-user.png -share/bmpx/images/library/new.png share/bmpx/images/logo-about.png share/bmpx/images/logo-splash.png -share/bmpx/images/main/add.png share/bmpx/images/main/header-logo-left.png share/bmpx/images/main/header-logo-right.png share/bmpx/images/main/header-logo-slice.png -share/bmpx/images/main/playing.png -share/bmpx/images/main/remove.png share/bmpx/images/main/warning.png share/bmpx/images/main/yingyang.gif share/bmpx/images/main/yingyang_paused.gif share/bmpx/images/main/yingyang_seeking.png share/bmpx/images/podcast/feed-default.png +share/bmpx/images/podcast/feed-expired.png +share/bmpx/images/preferences/lastfm.png share/bmpx/images/preferences/library.png share/bmpx/images/preferences/misc.png +share/bmpx/images/preferences/museek.png share/bmpx/images/preferences/musicbrainz.png share/bmpx/images/preferences/playback.png share/bmpx/images/preferences/podcasts.png @@ -190,61 +179,84 @@ share/bmpx/images/rating/stars_2.png share/bmpx/images/rating/stars_3.png share/bmpx/images/rating/stars_4.png share/bmpx/images/rating/stars_5.png +share/bmpx/images/sources/audiocd.png +share/bmpx/images/sources/jamendo.png +share/bmpx/images/sources/lastfm.png +share/bmpx/images/sources/library.png +share/bmpx/images/sources/playlist.png +share/bmpx/images/sources/podcasts.png +share/bmpx/images/sources/radio.png share/bmpx/images/stock/approve-partial.png share/bmpx/images/stock/approve.png +share/bmpx/images/stock/artist-blackstar.png +share/bmpx/images/stock/artist-mb.png +share/bmpx/images/stock/artist-multiple.png +share/bmpx/images/stock/artist.png share/bmpx/images/stock/audio.png share/bmpx/images/stock/bmp.png share/bmpx/images/stock/cdrom.png -share/bmpx/images/stock/entry-clear.png +share/bmpx/images/stock/clear.png +share/bmpx/images/stock/eek.png +share/bmpx/images/stock/equalizer.png +share/bmpx/images/stock/feed.png +share/bmpx/images/stock/jamendo.png share/bmpx/images/stock/lastfm-ban.png share/bmpx/images/stock/lastfm-love.png share/bmpx/images/stock/lastfm-skip.png share/bmpx/images/stock/lastfm.png share/bmpx/images/stock/library.png -share/bmpx/images/stock/museek.png +share/bmpx/images/stock/lyrics.png share/bmpx/images/stock/musicbrainz.png +share/bmpx/images/stock/play.png share/bmpx/images/stock/playlist.png -share/bmpx/images/stock/shoutcast.png +share/bmpx/images/stock/repeat.png +share/bmpx/images/stock/search.png +share/bmpx/images/stock/shuffle.png share/bmpx/images/stock/silk-add.png share/bmpx/images/stock/silk-application_edit.png share/bmpx/images/stock/silk-attach.png share/bmpx/images/stock/silk-cart_put.png -share/bmpx/images/stock/silk-cd_add.png share/bmpx/images/stock/silk-cd_delete.png share/bmpx/images/stock/silk-cd_edit.png -share/bmpx/images/stock/silk-cd_go.png -share/bmpx/images/stock/silk-cog.png -share/bmpx/images/stock/silk-control_pause_blue.png -share/bmpx/images/stock/silk-control_play_blue.png -share/bmpx/images/stock/silk-control_stop_blue.png share/bmpx/images/stock/silk-delete.png +share/bmpx/images/stock/silk-disk.png share/bmpx/images/stock/silk-drive.png share/bmpx/images/stock/silk-exclamation.png -share/bmpx/images/stock/silk-feed.png share/bmpx/images/stock/silk-feed_add.png share/bmpx/images/stock/silk-feed_delete.png -share/bmpx/images/stock/silk-folder_star.png +share/bmpx/images/stock/silk-feed_disk.png +share/bmpx/images/stock/silk-folder.png share/bmpx/images/stock/silk-html.png -share/bmpx/images/stock/silk-mod-server_down.png -share/bmpx/images/stock/silk-mod-server_up.png share/bmpx/images/stock/silk-new.png share/bmpx/images/stock/silk-picture.png share/bmpx/images/stock/silk-plugin.png share/bmpx/images/stock/silk-plugin_disabled.png -share/bmpx/images/stock/silk-tag_blue_add.png -share/bmpx/images/stock/silk-tag_blue_delete.png +share/bmpx/images/stock/silk-server_database.png +share/bmpx/images/stock/silk-world_link.png share/bmpx/images/stock/tag.png +share/bmpx/images/stock/track.png +share/bmpx/images/stock/undo.png share/bmpx/images/stock/xiph.png share/bmpx/images/svg/button-background.svg -share/bmpx/images/svg/button-glow-overlay.svg share/bmpx/images/svg/button-outline.svg share/bmpx/images/throbber.gif -share/dbus-1/services/org.beepmediaplayer.bmp.service share/dbus-1/services/org.beepmediaplayer.sentinel.service +share/dbus-1/services/org.mpris.bmp.service +share/doc/bmpx/images/active-source.png +share/doc/bmpx/images/bmp-logo-small.png +share/doc/bmpx/images/bmp.png +share/doc/bmpx/images/favicon.ico +share/doc/bmpx/images/gradient.png +share/doc/bmpx/images/important.png +share/doc/bmpx/images/main-window.png +share/doc/bmpx/images/playing-source.png +share/doc/bmpx/images/rect1869.png +share/doc/bmpx/images/tip.png share/icons/hicolor/48x48/apps/bmpx.png share/locale/af/LC_MESSAGES/bmpx.mo share/locale/cs/LC_MESSAGES/bmpx.mo share/locale/de/LC_MESSAGES/bmpx.mo +share/locale/dk/LC_MESSAGES/bmpx.mo share/locale/el/LC_MESSAGES/bmpx.mo share/locale/es/LC_MESSAGES/bmpx.mo share/locale/et/LC_MESSAGES/bmpx.mo @@ -263,13 +275,20 @@ share/locale/ru/LC_MESSAGES/bmpx.mo share/locale/sv/LC_MESSAGES/bmpx.mo share/locale/th_TH/LC_MESSAGES/bmpx.mo share/locale/zh_CN/LC_MESSAGES/bmpx.mo +@dirrm share/locale/th_TH/LC_MESSAGES +@dirrm share/locale/th_TH +@dirrm share/icons/hicolor/48x48/apps +@dirrm share/doc/bmpx/images +@dirrm share/doc/bmpx @comment in dbus: @dirrm share/dbus-1/services @dirrm share/bmpx/images/svg @dirrm share/bmpx/images/stock +@dirrm share/bmpx/images/sources @dirrm share/bmpx/images/rating @dirrm share/bmpx/images/preferences @dirrm share/bmpx/images/podcast @dirrm share/bmpx/images/main +@exec ${MKDIR} %D/share/bmpx/images/library @dirrm share/bmpx/images/library @dirrm share/bmpx/images/lastfm @dirrm share/bmpx/images/hal @@ -285,6 +304,7 @@ share/locale/zh_CN/LC_MESSAGES/bmpx.mo @dirrm share/bmpx/icons/themes @dirrm share/bmpx/icons @dirrm share/bmpx/glade +@exec ${MKDIR} %D/share/bmpx/data @dirrm share/bmpx/data @dirrm share/bmpx @comment in xdg-dirs: @dirrm share/applications diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo index 69338c020e4..746e7bdb2ca 100644 --- a/audio/bmpx/distinfo +++ b/audio/bmpx/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.2 2007/02/19 08:38:48 joerg Exp $ +$NetBSD: distinfo,v 1.3 2007/08/12 23:13:06 wiz Exp $ -SHA1 (bmpx-0.36.1.tar.bz2) = d1f798038add19b95f292e16cbfe88e91f02034a -RMD160 (bmpx-0.36.1.tar.bz2) = 92acca3fd41fff77f1e8224b186ccfb6e7de6f2f -Size (bmpx-0.36.1.tar.bz2) = 2452879 bytes -SHA1 (patch-aa) = 9d8eb9ef61823fe1e93b2963016fcc40093fd850 -SHA1 (patch-ab) = a386c54450a03a303dea8db6baac06c97f6a6f3b -SHA1 (patch-ac) = 66336aa81fabe140ea9698d0cada3a4273695074 -SHA1 (patch-ad) = 87c6603433349ea15c3a85637f57daa99f8f8a9d +SHA1 (bmpx-0.40.1.tar.bz2) = c2d69fd8909d1d7a69ff13eee149084da9b802f0 +RMD160 (bmpx-0.40.1.tar.bz2) = 8d00392449ad4602e380c9f78cb12c4077db9eec +Size (bmpx-0.40.1.tar.bz2) = 1793356 bytes diff --git a/audio/bmpx/patches/patch-aa b/audio/bmpx/patches/patch-aa deleted file mode 100644 index 9074185a4f6..00000000000 --- a/audio/bmpx/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/02/09 21:04:00 drochner Exp $ - ---- src/Makefile.in.orig 2006-12-13 21:35:45.000000000 +0000 -+++ src/Makefile.in -@@ -38,7 +38,6 @@ host_triplet = @host@ - target_triplet = @target@ - libexec_PROGRAMS = bmp2-bin$(EXEEXT) - @HAVE_HAL_TRUE@am__append_1 = $(top_builddir)/libhal++/libhalcc.la --@HAVE_SUN_FALSE@am__append_2 = -D_XOPEN_SOURCE=600 - @HAVE_VISUALIZATIONS_TRUE@am__append_3 = video-widget.hh \ - @HAVE_VISUALIZATIONS_TRUE@ video-widget.cc - @HAVE_GAIM_TRUE@am__append_4 = gaim-dbus.hh dialog-gaim-send-file.hh diff --git a/audio/bmpx/patches/patch-ab b/audio/bmpx/patches/patch-ab deleted file mode 100644 index a64bdcb92d4..00000000000 --- a/audio/bmpx/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2007/02/19 08:38:48 joerg Exp $ - ---- src/memmem.h.orig 2007-02-16 15:14:24.000000000 +0000 -+++ src/memmem.h -@@ -23,6 +23,8 @@ - #ifndef _MEMMEM_H - #define _MEMMEM_H 1 - -+#include -+ - #if defined(__cplusplus) - extern "C" { - #endif diff --git a/audio/bmpx/patches/patch-ac b/audio/bmpx/patches/patch-ac deleted file mode 100644 index e4cfbc99e8c..00000000000 --- a/audio/bmpx/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2007/02/19 08:38:48 joerg Exp $ - ---- sqlite/Makefile.in.orig 2007-02-16 15:19:28.000000000 +0000 -+++ sqlite/Makefile.in -@@ -404,7 +404,7 @@ libsqlite_la_CFLAGS = \ - -DSQLITE_ENABLE_COLUMN_METADATA - - libsqlite_la_LDFLAGS = \ -- -lpthread -+ ${SQLITE_PTHREAD} - - libsqlite_la_SOURCES = \ - alter.c \ diff --git a/audio/bmpx/patches/patch-ad b/audio/bmpx/patches/patch-ad deleted file mode 100644 index bd5a4963396..00000000000 --- a/audio/bmpx/patches/patch-ad +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2007/02/19 08:38:49 joerg Exp $ - ---- sqlite/os_unix.c.orig 2006-12-13 19:53:18.000000000 +0000 -+++ sqlite/os_unix.c -@@ -494,6 +494,7 @@ static int lockTrace(int fd, int op, str - #define fcntl lockTrace - #endif /* SQLITE_LOCK_TRACE */ - -+#if SQLITE_THREAD_OVERRIDE_LOCK == -1 - /* - ** The testThreadLockingBehavior() routine launches two separate - ** threads on this routine. This routine attempts to lock a file -@@ -534,6 +535,7 @@ static void testThreadLockingBehavior(in - close(fd); - threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0; - } -+#endif - #endif /* SQLITE_UNIX_THREADS */ - - /* -@@ -662,9 +664,11 @@ static int findLockInfo( - key1.dev = statbuf.st_dev; - key1.ino = statbuf.st_ino; - #ifdef SQLITE_UNIX_THREADS -+#if SQLITE_THREAD_OVERRIDE_LOCK == -1 - if( threadsOverrideEachOthersLocks<0 ){ - testThreadLockingBehavior(fd); - } -+#endif - key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self(); - #endif - memset(&key2, 0, sizeof(key2)); -- cgit v1.2.3