> This updates picard to version 0.12.1 and links it with the ffmpeg
> libs and the libofa port I submitted.
>
> The extra libs allow picard to do audio fingerprinting to classify
> files does not otherwise recognize.
Updated Makefile that uses LIB_DEPENDS as per marty...@.
- todd
Index: audio/picard/Makefile
===================================================================
RCS file: /home/cvs/openbsd/ports/audio/picard/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- audio/picard/Makefile 15 Nov 2010 00:22:48 -0000 1.8
+++ audio/picard/Makefile 19 Nov 2010 19:33:00 -0000
@@ -2,9 +2,8 @@
COMMENT = automatic audio files tagger using the MusicBrainz
database
-MODPY_EGG_VERSION = 0.11
+MODPY_EGG_VERSION = 0.12.1
DISTNAME = picard-${MODPY_EGG_VERSION}
-REVISION = 5
CATEGORIES = audio
@@ -18,7 +17,7 @@
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += m stdc++
+WANTLIB += m stdc++ avcodec avformat ofa
MASTER_SITES = ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
@@ -31,6 +30,8 @@
# msgfmt
BUILD_DEPENDS = devel/gettext
+LIB_DEPENDS = audio/libofa graphics/ffmpeg
+
RUN_DEPENDS = py-qt4->=4.1:x11/py-qt4 \
py-mutagen->=1.9:audio/py-mutagen \
devel/desktop-file-utils
@@ -45,13 +46,14 @@
discnumber.py \
featartist.py \
fix_mp4_meta.py \
- initials.py \
lastfm/__init__.py \
lastfm/options_lastfm.ui \
lastfm/ui_options_lastfm.py \
+ originalreleasedate.py \
replaygain/__init__.py \
replaygain/options_replaygain.ui \
- replaygain/ui_options_replaygain.py
+ replaygain/ui_options_replaygain.py \
+ titlecase.py
post-install:
.for dir in ${PLUGINS_DIRS}
Index: audio/picard/distinfo
===================================================================
RCS file: /home/cvs/openbsd/ports/audio/picard/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- audio/picard/distinfo 12 Jul 2009 20:43:22 -0000 1.1.1.1
+++ audio/picard/distinfo 19 Nov 2010 13:27:32 -0000
@@ -1,5 +1,5 @@
-MD5 (picard-0.11.tar.gz) = At3P8+IBss9U8bUrAtRPrQ==
-RMD160 (picard-0.11.tar.gz) = II5FYh4QcG/n9RmHGGWbO4XrpKo=
-SHA1 (picard-0.11.tar.gz) = cC5r5tDllch7IeeiCJTQBO/DaT8=
-SHA256 (picard-0.11.tar.gz) = x7UXDtyvw12q/YuZDv3f2leBY0lDLQpqN4afDEgxVqs=
-SIZE (picard-0.11.tar.gz) = 442371
+MD5 (picard-0.12.1.tar.gz) = z+WU1okkr7wHBIiBMClchQ==
+RMD160 (picard-0.12.1.tar.gz) = nZHlP26g/UxKJb0dvYA2pBOXGu8=
+SHA1 (picard-0.12.1.tar.gz) = llQS3pVNKnNIehMytJrHcl5xnww=
+SHA256 (picard-0.12.1.tar.gz) = f/sopHthDEXP2XLqy7ZclaIkrq7QdQ1XxhpH0p+agYM=
+SIZE (picard-0.12.1.tar.gz) = 1361157
Index: audio/picard/patches/patch-picard_const_py
===================================================================
RCS file: audio/picard/patches/patch-picard_const_py
diff -N audio/picard/patches/patch-picard_const_py
--- audio/picard/patches/patch-picard_const_py 19 Jul 2009 09:06:43 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-picard_const_py,v 1.1 2009/07/19 09:06:43 ajacoutot Exp $
-
-Quick and dirty patch to solve the bug in Picard when we use the command
-"pydoc -k". Also make the regress target works.
-
---- picard/const.py.orig Sat Jul 18 00:02:45 2009
-+++ picard/const.py Sat Jul 18 00:03:23 2009
-@@ -17,6 +17,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
-
-+import __builtin__
-+__builtin__.__dict__['N_'] = lambda a: a
-
- # Host for PUID submissions
- PUID_SUBMIT_HOST = "musicbrainz.org"
Index: audio/picard/patches/patch-setup_py
===================================================================
RCS file: /home/cvs/openbsd/ports/audio/picard/patches/patch-setup_py,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-setup_py
--- audio/picard/patches/patch-setup_py 12 Jul 2009 20:43:22 -0000 1.1.1.1
+++ audio/picard/patches/patch-setup_py 19 Nov 2010 13:22:08 -0000
@@ -1,7 +1,24 @@
$OpenBSD: patch-setup_py,v 1.1.1.1 2009/07/12 20:43:22 ajacoutot Exp $
---- setup.py.orig Mon Dec 1 17:27:05 2008
-+++ setup.py Tue May 26 23:48:01 2009
-@@ -76,7 +76,7 @@ cfg.read(['build.cfg'])
+--- setup.py.orig Sun Nov 1 13:10:27 2009
++++ setup.py Fri Nov 19 08:22:02 2010
+@@ -62,12 +62,12 @@ from distutils.dist import Distribution
+ defaults = {
+ 'build': {
+ 'with-directshow': 'False',
+- 'with-avcodec': 'False',
+- 'with-libofa': 'False',
++ 'with-avcodec': 'True',
++ 'with-libofa': 'True',
+ },
+- 'avcodec': {'cflags': '', 'libs': ''},
++ 'avcodec': {'cflags': '-I/usr/local/include', 'libs': '-L/usr/local/lib
-lavcodec -lavformat'},
+ 'directshow': {'cflags': '', 'libs': ''},
+- 'libofa': {'cflags': '', 'libs': ''},
++ 'libofa': {'cflags': '-I/usr/local/include', 'libs': '-L/usr/local/lib
-lofa'},
+ }
+ cfg = RawConfigParser()
+ for section, values in defaults.items():
+@@ -78,7 +78,7 @@ cfg.read(['build.cfg'])
ext_modules = [
@@ -10,12 +27,33 @@
]
if cfg.getboolean('build', 'with-libofa'):
-@@ -529,7 +529,7 @@ if do_py2app:
+@@ -372,8 +372,8 @@ class picard_config(config):
+ if have_pkgconfig:
+ if self.pkgconfig_check_module('avcodec', 'libavcodec
libavformat'):
+ include_dirs = cflags_to_include_dirs(cfg.get('avcodec',
'cflags'))
+- if self.try_compile('#include <avcodec.h>',
include_dirs=include_dirs):
+- cfg.set('avcodec', 'cflags', cfg.get('avcodec', 'cflags')
+ ' -DUSE_OLD_FFMPEG_LOCATIONS')
++ if self.try_compile('#include <libavcodec/avcodec.h>',
include_dirs=include_dirs):
++ cfg.set('avcodec', 'cflags', cfg.get('avcodec', 'cflags'))
+ else:
+ self.check_lib('avcodec', 'av_open_input_file', ['avcodec.h',
'avformat.h'], [['avcodec', 'avformat'], ['avcodec-51', 'avformat-51']])
+
+@@ -549,12 +549,12 @@ if do_py2app:
# FIXME: this should check for the actual command ('install' vs.
'bdist_nsis', 'py2app', ...), not installed libraries
if py2exe is None and do_py2app is False:
-- args['data_files'].append(('share/icons', ('picard-16.png',
'picard-32.png')))
-+ args['data_files'].append(('share/pixmaps', ('picard-16.png',
'picard-32.png')))
+- args['data_files'].append(('share/icons/hicolor/16x16/apps',
['resources/images/16x16/picard.png']))
+- args['data_files'].append(('share/icons/hicolor/24x24/apps',
['resources/images/24x24/picard.png']))
+- args['data_files'].append(('share/icons/hicolor/32x32/apps',
['resources/images/32x32/picard.png']))
+- args['data_files'].append(('share/icons/hicolor/48x48/apps',
['resources/images/48x48/picard.png']))
+- args['data_files'].append(('share/icons/hicolor/128x128/apps',
['resources/images/128x128/picard.png']))
+- args['data_files'].append(('share/icons/hicolor/256x256/apps',
['resources/images/256x256/picard.png']))
++ args['data_files'].append(('share/pixmaps/hicolor/16x16/apps',
['resources/images/16x16/picard.png']))
++ args['data_files'].append(('share/pixmaps/hicolor/24x24/apps',
['resources/images/24x24/picard.png']))
++ args['data_files'].append(('share/pixmaps/hicolor/32x32/apps',
['resources/images/32x32/picard.png']))
++ args['data_files'].append(('share/pixmaps/hicolor/48x48/apps',
['resources/images/48x48/picard.png']))
++ args['data_files'].append(('share/pixmaps/hicolor/128x128/apps',
['resources/images/128x128/picard.png']))
++ args['data_files'].append(('share/pixmaps/hicolor/256x256/apps',
['resources/images/256x256/picard.png']))
args['data_files'].append(('share/applications', ('picard.desktop',)))
Index: audio/picard/pkg/PLIST
===================================================================
RCS file: /home/cvs/openbsd/ports/audio/picard/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- audio/picard/pkg/PLIST 22 Dec 2009 15:43:15 -0000 1.2
+++ audio/picard/pkg/PLIST 19 Nov 2010 13:28:01 -0000
@@ -58,6 +58,8 @@
lib/python${MODPY_VERSION}/site-packages/picard/musicdns/
lib/python${MODPY_VERSION}/site-packages/picard/musicdns/__init__.py
lib/python${MODPY_VERSION}/site-packages/picard/musicdns/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/musicdns/avcodec.so
+lib/python${MODPY_VERSION}/site-packages/picard/musicdns/ofa.so
lib/python${MODPY_VERSION}/site-packages/picard/parsefilename.py
lib/python${MODPY_VERSION}/site-packages/picard/parsefilename.pyc
lib/python${MODPY_VERSION}/site-packages/picard/playlist.py
@@ -121,12 +123,16 @@
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/matching.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/metadata.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/metadata.pyc
-lib/python${MODPY_VERSION}/site-packages/picard/ui/options/naming.py
-lib/python${MODPY_VERSION}/site-packages/picard/ui/options/naming.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/moving.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/moving.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/plugins.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/plugins.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/proxy.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/proxy.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/ratings.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/ratings.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/renaming.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/options/renaming.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/scripting.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/scripting.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/options/tags.py
@@ -135,6 +141,8 @@
lib/python${MODPY_VERSION}/site-packages/picard/ui/passworddialog.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/puidsubmit.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/puidsubmit.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ratingwidget.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ratingwidget.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/tageditor.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/tageditor.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/tagsfromfilenames.py
@@ -151,8 +159,8 @@
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_about.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cdlookup.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cdlookup.pyc
-lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cdlookup_win32.py
-lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cdlookup_win32.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cdlookup_select.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cdlookup_select.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cover.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_cover.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_folksonomy.py
@@ -165,12 +173,16 @@
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_matching.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_metadata.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_metadata.pyc
-lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_naming.py
-lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_naming.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_moving.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_moving.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_plugins.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_plugins.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_proxy.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_proxy.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_ratings.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_ratings.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_renaming.py
+lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_renaming.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_script.py
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_script.pyc
lib/python${MODPY_VERSION}/site-packages/picard/ui/ui_options_tags.py
@@ -193,6 +205,8 @@
lib/python${MODPY_VERSION}/site-packages/picard/util/cdrom.pyc
lib/python${MODPY_VERSION}/site-packages/picard/util/icontheme.py
lib/python${MODPY_VERSION}/site-packages/picard/util/icontheme.pyc
+lib/python${MODPY_VERSION}/site-packages/picard/util/mimetype.py
+lib/python${MODPY_VERSION}/site-packages/picard/util/mimetype.pyc
lib/python${MODPY_VERSION}/site-packages/picard/util/queue.py
lib/python${MODPY_VERSION}/site-packages/picard/util/queue.pyc
lib/python${MODPY_VERSION}/site-packages/picard/util/tags.py
@@ -204,6 +218,9 @@
lib/python${MODPY_VERSION}/site-packages/picard/webservice.py
lib/python${MODPY_VERSION}/site-packages/picard/webservice.pyc
share/applications/picard.desktop
+share/locale/af/LC_MESSAGES/picard.mo
+share/locale/ar/LC_MESSAGES/picard.mo
+share/locale/bg/LC_MESSAGES/picard.mo
share/locale/ca/LC_MESSAGES/picard.mo
share/locale/cs/LC_MESSAGES/picard.mo
share/locale/cy/LC_MESSAGES/picard.mo
@@ -213,13 +230,16 @@
share/locale/en_CA/LC_MESSAGES/picard.mo
share/locale/en_GB/LC_MESSAGES/picard.mo
share/locale/es/LC_MESSAGES/picard.mo
+share/locale/et/LC_MESSAGES/picard.mo
share/locale/fa/LC_MESSAGES/picard.mo
share/locale/fi/LC_MESSAGES/picard.mo
share/locale/fr/LC_MESSAGES/picard.mo
share/locale/fy/
share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/picard.mo
+share/locale/gl/LC_MESSAGES/picard.mo
share/locale/he/LC_MESSAGES/picard.mo
+share/locale/hi/LC_MESSAGES/picard.mo
share/locale/hu/LC_MESSAGES/picard.mo
share/locale/is/LC_MESSAGES/picard.mo
share/locale/it/LC_MESSAGES/picard.mo
@@ -238,7 +258,9 @@
share/locale/sco/LC_MESSAGES/picard.mo
share/locale/sk/LC_MESSAGES/picard.mo
share/locale/sl/LC_MESSAGES/picard.mo
+share/locale/sr/LC_MESSAGES/picard.mo
share/locale/sv/LC_MESSAGES/picard.mo
+share/locale/tr/LC_MESSAGES/picard.mo
share/locale/zh_CN/LC_MESSAGES/picard.mo
share/picard/
share/picard/addrelease.py
@@ -247,17 +269,35 @@
share/picard/discnumber.py
share/picard/featartist.py
share/picard/fix_mp4_meta.py
-share/picard/initials.py
share/picard/lastfm/
share/picard/lastfm/__init__.py
share/picard/lastfm/options_lastfm.ui
share/picard/lastfm/ui_options_lastfm.py
+share/picard/originalreleasedate.py
share/picard/replaygain/
share/picard/replaygain/__init__.py
share/picard/replaygain/options_replaygain.ui
share/picard/replaygain/ui_options_replaygain.py
+share/picard/titlecase.py
share/pixmaps/
-share/pixmaps/picard-16.png
-share/pixmaps/picard-32.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
+share/pixmaps/hicolor/
+share/pixmaps/hicolor/128x128/
+share/pixmaps/hicolor/128x128/apps/
+share/pixmaps/hicolor/128x128/apps/picard.png
+share/pixmaps/hicolor/16x16/
+share/pixmaps/hicolor/16x16/apps/
+share/pixmaps/hicolor/16x16/apps/picard.png
+share/pixmaps/hicolor/24x24/
+share/pixmaps/hicolor/24x24/apps/
+share/pixmaps/hicolor/24x24/apps/picard.png
+share/pixmaps/hicolor/256x256/
+share/pixmaps/hicolor/256x256/apps/
+share/pixmaps/hicolor/256x256/apps/picard.png
+share/pixmaps/hicolor/32x32/
+share/pixmaps/hicolor/32x32/apps/
+share/pixmaps/hicolor/32x32/apps/picard.png
+share/pixmaps/hicolor/48x48/
+share/pixmaps/hicolor/48x48/apps/
+share/pixmaps/hicolor/48x48/apps/picard.png
