On Tue, Dec 21, 2010 at 10:37:31AM +0100, LEVAI Daniel wrote:
> On Sun, Dec 19, 2010 at 23:09:09 +0100, Jasper Lievisse Adriaanse wrote:
> > On Fri, Dec 17, 2010 at 11:47:23AM +0100, LEVAI Daniel wrote:
> > > Hi!
> > >
> > >
> > > Here is an update to the libmtp port to version 1.0.3. The API is not
> > > compatible with the old one, so I had to update the only two depending
> > > ports: amarok and gnomad2 (minor, not too intrusive patches).
> > > The new libmtp is needed for a new port on which I'm working currently.
> > > It is an advanced and Qt4 port of amarok, called clementine.
> > > Please see the attached patch(es).
> > >
> > > I've sent this to william@ also, and he said ok to the libmtp port, but
> > > he couldn't find time to test the audio players. So here I am, asking
> > > for some feedback.
> > what's up with the @exec stuff in the PLIST for libmtp ?
> Sorry, that is some delirious copying from another port. I thought I'm
> doing it right.
>
> I've updated the patch accordingly.
>
>
> Daniel
Did you forget to diff the patches directory when generating this diff?
As I get this with make patch:
No such line 19876 in input file, ignoring
1 out of 2 hunks failed--saving rejects to examples/albumart.c.rej
***> patch-examples_albumart_c did not apply cleanly
3 out of 3 hunks failed--saving rejects to examples/connect.c.rej
***> patch-examples_connect_c did not apply cleanly
1 out of 1 hunks failed--saving rejects to examples/newfolder.c.rej
***> patch-examples_newfolder_c did not apply cleanly
1 out of 2 hunks failed--saving rejects to examples/newplaylist.c.rej
***> patch-examples_newplaylist_c did not apply cleanly
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to libmtp.pc.in.rej
***> patch-libmtp_pc_in did not apply cleanly
Cheers,
Jasper
> ps.: sorry Jasper for posting to ports@ the private mail, but your mx
> server gave me "Client host rejected: Access denied" for whatever
> reason...
Odd..
> --
> L?VAI D?niel
> PGP key ID = 0x83B63A8F
> Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/libmtp/Makefile,v
> retrieving revision 1.14
> diff -p -u -r1.14 Makefile
> --- Makefile 15 Nov 2010 19:46:00 -0000 1.14
> +++ Makefile 21 Dec 2010 09:30:08 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT= Media Transfer Protocol (MTP) implementation
>
> -DISTNAME= libmtp-0.2.6.1
> +DISTNAME= libmtp-1.0.3
> PKGNAME= ${DISTNAME}
> -REVISION= 2
> -SHARED_LIBS= mtp 3.0 # .8.0
> +SHARED_LIBS= mtp 11.1
> CATEGORIES= devel
>
> HOMEPAGE= http://libmtp.sourceforge.net/
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/libmtp/distinfo,v
> retrieving revision 1.7
> diff -p -u -r1.7 distinfo
> --- distinfo 21 Apr 2008 15:23:22 -0000 1.7
> +++ distinfo 21 Dec 2010 09:30:08 -0000
> @@ -1,5 +1,5 @@
> -MD5 (libmtp-0.2.6.1.tar.gz) = AncKe0v7kc2eG9JuqoR3Cw==
> -RMD160 (libmtp-0.2.6.1.tar.gz) = /C1+YFU3UT6YTDGMMBM35+pNPbk=
> -SHA1 (libmtp-0.2.6.1.tar.gz) = yRoSsk2tAz9xtNr+2hE+soGZFUM=
> -SHA256 (libmtp-0.2.6.1.tar.gz) = +AgImd7n7JqXBHiEs9UeW9MYpif4TTXD9NapZ+Oc3Vc=
> -SIZE (libmtp-0.2.6.1.tar.gz) = 534773
> +MD5 (libmtp-1.0.3.tar.gz) = qXKGmGB2VHblLy66RfK5Hg==
> +RMD160 (libmtp-1.0.3.tar.gz) = u7WPIxvJRjj6cgC2wIOp3d0UwPQ=
> +SHA1 (libmtp-1.0.3.tar.gz) = PSN9wC5CDZzLjyU50oGLL2GOr18=
> +SHA256 (libmtp-1.0.3.tar.gz) = HQBIdhjnabvmQSYabhMSx7rDwoFwrysTp1C4+kAUyso=
> +SIZE (libmtp-1.0.3.tar.gz) = 596040
> Index: pkg/PFRAG.shared
> ===================================================================
> RCS file: /cvs/ports/devel/libmtp/pkg/PFRAG.shared,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 PFRAG.shared
> --- pkg/PFRAG.shared 11 Jan 2007 21:56:16 -0000 1.1.1.1
> +++ pkg/PFRAG.shared 21 Dec 2010 09:30:08 -0000
> @@ -1,2 +1,2 @@
> -...@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/01/11 21:56:16 jasper Exp $
> +...@comment $OpenBSD$
> @lib lib/libmtp.so.${LIBmtp_VERSION}
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/libmtp/pkg/PLIST,v
> retrieving revision 1.2
> diff -p -u -r1.2 PLIST
> --- pkg/PLIST 30 Dec 2007 19:57:35 -0000 1.2
> +++ pkg/PLIST 21 Dec 2010 09:30:08 -0000
> @@ -1,26 +1,26 @@
> -...@comment $OpenBSD: PLIST,v 1.2 2007/12/30 19:57:35 jasper Exp $
> +...@comment $OpenBSD$
> %%SHARED%%
> -bin/mtp-albumart
> -bin/mtp-albums
> -bin/mtp-connect
> +...@bin bin/mtp-albumart
> +...@bin bin/mtp-albums
> +...@bin bin/mtp-connect
> bin/mtp-delfile
> -bin/mtp-detect
> -bin/mtp-emptyfolders
> -bin/mtp-files
> -bin/mtp-folders
> -bin/mtp-format
> +...@bin bin/mtp-detect
> +...@bin bin/mtp-emptyfolders
> +...@bin bin/mtp-files
> +...@bin bin/mtp-folders
> +...@bin bin/mtp-format
> bin/mtp-getfile
> -bin/mtp-getplaylist
> -bin/mtp-hotplug
> +...@bin bin/mtp-getplaylist
> +...@bin bin/mtp-hotplug
> bin/mtp-newfolder
> -bin/mtp-newplaylist
> -bin/mtp-playlists
> -bin/mtp-reset
> +...@bin bin/mtp-newplaylist
> +...@bin bin/mtp-playlists
> +...@bin bin/mtp-reset
> bin/mtp-sendfile
> bin/mtp-sendtr
> -bin/mtp-thumb
> -bin/mtp-tracks
> -bin/mtp-trexist
> +...@bin bin/mtp-thumb
> +...@bin bin/mtp-tracks
> +...@bin bin/mtp-trexist
> include/libmtp.h
> lib/libmtp.a
> lib/libmtp.la
--
Cheers,
Jasper
"Capable, generous men do not create victims, they nurture them."
