cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 1.1.3

Browse Source 
- remove gcc2 patches which are unneeded (unless someone with a usb-capable
vax shows up)
- reset maintainer

ok william@ (previous maintainer)
This commit is contained in:
jasper 2012-04-23 13:39:50 +00:00
parent 14ea07a98a
commit abdcd487f1
13 changed files with 20 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devel/libmtp/Makefile
View File

@ -1,35 +1,35 @@
# $OpenBSD: Makefile,v 1.19 2012/04/01 21:05:20 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2012/04/23 13:39:50 jasper Exp $
COMMENT= Media Transfer Protocol (MTP) implementation
DISTNAME= libmtp-1.0.3
REVISION= 3
SHARED_LIBS= mtp 4.0
DISTNAME= libmtp-1.1.3
SHARED_LIBS += mtp 5.0 # 9.3
CATEGORIES= devel
HOMEPAGE= http://libmtp.sourceforge.net/
MAINTAINER= William Yodlowsky <william@openbsd.org>
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c usb pthread usb-1.0
WANTLIB= c gcrypt gpg-error pthread usb-1.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libmtp/}
MODULES= converters/libiconv
MODULES= devel/gettext
BUILD_DEPENDS= devel/doxygen
MAKE_ENV+= DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
LIB_DEPENDS= devel/libusb-compat
LIB_DEPENDS= devel/libusb1 \
security/libgcrypt
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS+= --enable-doxygen
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -pthread" \
CPPFLAGS="-I${LOCALBASE}/include"
FAKE_FLAGS+= pkgdocdir="${PREFIX}/share/doc/libmtp/"

10
devel/libmtp/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (libmtp-1.1.3.tar.gz) = EVKe7a8OH8AM3WEZ7sUl8A==
RMD160 (libmtp-1.1.3.tar.gz) = 3uGd7ssyO+opDRlgRmu09vO2/18=
SHA1 (libmtp-1.1.3.tar.gz) = qj3RATIHhNxMPg7otmmuTJA/YnU=
SHA256 (libmtp-1.1.3.tar.gz) = p5T4bLwdO0O2VNWgUATwmSX91E96jYfT8LTeQp596Pg=
SIZE (libmtp-1.1.3.tar.gz) = 689357

12
devel/libmtp/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2010/12/21 18:16:04 jasper Exp $
--- configure.orig Sun May 23 01:07:34 2010
+++ configure Tue Dec 21 14:08:52 2010
@@ -12689,7 +12689,7 @@ if test "x$ac_cv_lib_usb_usb_control_msg" = x""yes; th
#define HAVE_LIBUSB 1
_ACEOF
- LIBS="-lusb $LIBS"
+ LIBS="-lusb -liconv $LIBS"
else
{ { $as_echo "$as_me:$LINENO: error: I can't find the libusb libraries on your system. You

40
devel/libmtp/patches/patch-examples_albumart_c
View File

@ -1,40 +0,0 @@
$OpenBSD: patch-examples_albumart_c,v 1.2 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/albumart.c.orig Wed Oct 7 01:14:54 2009
+++ examples/albumart.c Tue Dec 21 13:57:21 2010
@@ -43,8 +43,11 @@ int main (int argc, char **argv) {
extern int optind;
extern char *optarg;
LIBMTP_mtpdevice_t *device = NULL;
+ LIBMTP_filesampledata_t *albumart = NULL;
+ LIBMTP_album_t *album = NULL;
int idcount = 0;
int fd;
+ int ret;
uint32_t *ids = NULL;
uint32_t *tmp = NULL;
uint64_t filesize;
@@ -135,18 +138,18 @@ int main (int argc, char **argv) {
return 0;
}
- LIBMTP_filesampledata_t *albumart = LIBMTP_new_filesampledata_t();
+ albumart = LIBMTP_new_filesampledata_t();
albumart->data = imagedata;
albumart->size = filesize;
albumart->filetype = LIBMTP_FILETYPE_JPEG;
- LIBMTP_album_t *album = LIBMTP_new_album_t();
+ album = LIBMTP_new_album_t();
album->name = albumname;
album->no_tracks = idcount;
album->tracks = ids;
album->parent_id = parentid;
album->storage_id = storageid;
- int ret = LIBMTP_Create_New_Album(device,album);
+ ret = LIBMTP_Create_New_Album(device,album);
if (ret == 0) {
ret = LIBMTP_Send_Representative_Sample(device,album->album_id, albumart);
if (ret != 0) {

24
devel/libmtp/patches/patch-examples_connect_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-examples_connect_c,v 1.2 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/connect.c.orig Sat Jan 30 08:31:15 2010
+++ examples/connect.c Tue Dec 21 14:01:22 2010
@@ -77,6 +77,9 @@ usage(void)
int main (int argc, char **argv)
{
+ char *arg1, *arg2;
+
+
checklang();
LIBMTP_Init();
@@ -122,7 +125,6 @@ int main (int argc, char **argv)
if (c == -1)
break;
- char *arg1, *arg2;
switch (c) {
case 'd':
printf("Delete %s\n",optarg);

18
devel/libmtp/patches/patch-examples_delfile_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-examples_delfile_c,v 1.2 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/delfile.c.orig Thu May 7 01:04:19 2009
+++ examples/delfile.c Tue Dec 21 14:02:39 2010
@@ -43,10 +43,10 @@ void
delfile_function(char * path)
{
uint32_t id = parse_path (path,files,folders);
+ int ret = 1;
if (id > 0) {
printf("Deleting %s which has item_id:%d\n",path,id);
- int ret = 1;
ret = LIBMTP_Delete_Object(device, id);
if (ret != 0) {
LIBMTP_Dump_Errorstack(device);

28
devel/libmtp/patches/patch-examples_emptyfolders_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-examples_emptyfolders_c,v 1.2 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/emptyfolders.c.orig Thu May 7 01:04:19 2009
+++ examples/emptyfolders.c Tue Dec 21 14:03:13 2010
@@ -62,6 +62,10 @@ int main (int argc, char **argv)
int do_delete = 0;
int opt;
+ LIBMTP_mtpdevice_t *device;
+ LIBMTP_folder_t *folders;
+ LIBMTP_file_t *files;
+
fprintf(stdout, "libmtp version: " LIBMTP_VERSION_STRING "\n\n");
while ( (opt = getopt(argc, argv, "d")) != -1 ) {
@@ -78,10 +82,6 @@ int main (int argc, char **argv)
printf("This is a dummy run. No folders will be deleted.\n");
printf("To delete folders, use the '-d' option.\n");
}
-
- LIBMTP_mtpdevice_t *device;
- LIBMTP_folder_t *folders;
- LIBMTP_file_t *files;
LIBMTP_Init();
device = LIBMTP_Get_First_Device();

20
devel/libmtp/patches/patch-examples_newfolder_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-examples_newfolder_c,v 1.2 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/newfolder.c.orig Thu May 7 01:04:19 2009
+++ examples/newfolder.c Tue Dec 21 14:03:42 2010
@@ -54,11 +54,12 @@ void newfolder_command (int argc, char **argv)
void
newfolder_function(char * path)
{
- printf("Creating new folder %s\n",path);
char * parent = dirname(path);
char * folder = basename(path);
int id = parse_path (parent,files,folders);
int newid = LIBMTP_Create_Folder(device, folder, id, 0);
+
+ printf("Creating new folder %s\n",path);
if (newid == 0) {
printf("Folder creation failed.\n");
LIBMTP_Dump_Errorstack(device);

34
devel/libmtp/patches/patch-examples_newplaylist_c
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-examples_newplaylist_c,v 1.2 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/newplaylist.c.orig Wed Oct 7 01:14:54 2009
+++ examples/newplaylist.c Tue Dec 21 14:05:23 2010
@@ -34,9 +34,11 @@ static void usage(void) {
int main (int argc, char **argv) {
int opt;
+ int ret;
extern int optind;
extern char *optarg;
LIBMTP_mtpdevice_t *device = NULL;
+ LIBMTP_playlist_t *playlist = NULL;
int idcount = 0;
uint32_t *ids = NULL;
uint32_t *tmp = NULL;
@@ -94,13 +96,13 @@ int main (int argc, char **argv) {
return 0;
}
- LIBMTP_playlist_t *playlist = LIBMTP_new_playlist_t();
+ playlist = LIBMTP_new_playlist_t();
playlist->name = playlistname;
playlist->no_tracks = idcount;
playlist->tracks = ids;
playlist->parent_id = parentid;
playlist->storage_id = storageid;
- int ret = LIBMTP_Create_New_Playlist(device,playlist);
+ ret = LIBMTP_Create_New_Playlist(device,playlist);
if (ret != 0) {
printf("Couldn't create playlist object\n");
LIBMTP_Dump_Errorstack(device);

22
devel/libmtp/patches/patch-examples_sendfile_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-examples_sendfile_c,v 1.2 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/sendfile.c.orig Mon Jun 15 21:45:05 2009
+++ examples/sendfile.c Tue Dec 21 14:07:04 2010
@@ -48,13 +48,14 @@ void sendfile_usage(void)
int sendfile_function(char * from_path, char *to_path)
{
- printf("Sending %s to %s\n",from_path,to_path);
char *filename;
uint64_t filesize;
struct stat sb;
LIBMTP_file_t *genfile;
int ret;
uint32_t parent_id = 0;
+
+ printf("Sending %s to %s\n",from_path,to_path);
if ( stat(from_path, &sb) == -1 ) {
fprintf(stderr, "%s: ", from_path);

33
devel/libmtp/patches/patch-examples_thumb_c
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-examples_thumb_c,v 1.2 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/thumb.c.orig Mon Jun 15 21:45:12 2009
+++ examples/thumb.c Tue Dec 21 14:07:54 2010
@@ -44,6 +44,7 @@ int main (int argc, char **argv) {
extern int optind;
extern char *optarg;
LIBMTP_mtpdevice_t *device = NULL;
+ LIBMTP_filesampledata_t *thumb = NULL;
int fd;
uint32_t id = 0;
uint64_t filesize;
@@ -52,6 +53,7 @@ int main (int argc, char **argv) {
char *rest;
struct stat statbuff;
int ret;
+ int i;
fprintf(stdout, "libmtp version: " LIBMTP_VERSION_STRING "\n\n");
@@ -104,9 +106,8 @@ int main (int argc, char **argv) {
return 0;
}
- LIBMTP_filesampledata_t *thumb = LIBMTP_new_filesampledata_t();
+ thumb = LIBMTP_new_filesampledata_t();
- int i;
thumb->data = malloc(sizeof(uint16_t) * filesize);
for (i = 0; i < filesize; i++) {
thumb->data[i] = imagedata[i];

16
devel/libmtp/patches/patch-examples_util_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-examples_util_c,v 1.1 2010/12/21 18:16:04 jasper Exp $
Fix compilation with GCC2.
--- examples/util.c.orig Tue Dec 2 13:20:17 2008
+++ examples/util.c Tue Dec 21 14:02:11 2010
@@ -34,7 +34,8 @@
void checklang(void)
{
char *langsuff = NULL;
- char *lang = getenv("LANG");
+ char *lang;
+ lang = getenv("LANG");
#ifdef HAVE_LOCALE_H
// Set the locale in accordance with environment

7
devel/libmtp/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2012/04/01 21:05:20 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2012/04/23 13:39:50 jasper Exp $
%%SHARED%%
@bin bin/mtp-albumart
@bin bin/mtp-albums
@ -7,11 +7,11 @@ bin/mtp-delfile
@bin bin/mtp-detect
@bin bin/mtp-emptyfolders
@bin bin/mtp-files
@bin bin/mtp-filetree
@bin bin/mtp-folders
@bin bin/mtp-format
bin/mtp-getfile
@bin bin/mtp-getplaylist
@bin bin/mtp-hotplug
bin/mtp-newfolder
@bin bin/mtp-newplaylist
@bin bin/mtp-playlists
@ -85,7 +85,6 @@ share/doc/libmtp/html/index.html
share/doc/libmtp/html/libmtp_8c.html
share/doc/libmtp/html/libmtp_8h.html
share/doc/libmtp/html/libmtp_8h_source.html
share/doc/libmtp/html/libptp-stdint_8h_source.html
share/doc/libmtp/html/libusb-glue_8h.html
share/doc/libmtp/html/libusb-glue_8h_source.html
share/doc/libmtp/html/mainpage_8h_source.html
@ -105,6 +104,7 @@ share/doc/libmtp/html/sendtr_8c-example.html
share/doc/libmtp/html/structLIBMTP__album__struct.html
share/doc/libmtp/html/structLIBMTP__allowed__values__struct.html
share/doc/libmtp/html/structLIBMTP__device__entry__struct.html
share/doc/libmtp/html/structLIBMTP__device__extension__struct.html
share/doc/libmtp/html/structLIBMTP__devicestorage__struct.html
share/doc/libmtp/html/structLIBMTP__error__struct.html
share/doc/libmtp/html/structLIBMTP__file__struct.html
@ -150,6 +150,7 @@ share/doc/libmtp/html/struct__PTP__USB.html
share/doc/libmtp/html/structfilemap__struct.html
share/doc/libmtp/html/structmtpdevice__list__struct.html
share/doc/libmtp/html/structpropertymap__struct.html
share/doc/libmtp/html/structtagptp__chdk__videosettings.html
share/doc/libmtp/html/structtext__struct.html
share/doc/libmtp/html/tab_a.png
share/doc/libmtp/html/tab_b.png