[csw-devel] SF.net SVN: gar:[13546] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Mar 3 14:26:17 CET 2011
Revision: 13546
http://gar.svn.sourceforge.net/gar/?rev=13546&view=rev
Author: dmichelsen
Date: 2011-03-03 13:26:16 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
id3lib: Initial commit
Added Paths:
-----------
csw/mgar/pkg/id3lib/
csw/mgar/pkg/id3lib/Makefile
csw/mgar/pkg/id3lib/branches/
csw/mgar/pkg/id3lib/tags/
csw/mgar/pkg/id3lib/trunk/
csw/mgar/pkg/id3lib/trunk/Makefile
csw/mgar/pkg/id3lib/trunk/checksums
csw/mgar/pkg/id3lib/trunk/files/
csw/mgar/pkg/id3lib/trunk/files/0001-Make-pointer-types-match.patch
csw/mgar/pkg/id3lib/trunk/files/0002-Do-not-use-Wall.patch
csw/mgar/pkg/id3lib/trunk/files/0003-Work-around-conversion-in-iostream.patch
Copied: csw/mgar/pkg/id3lib/Makefile (from rev 13545, csw/mgar/pkg/template/Makefile)
===================================================================
--- csw/mgar/pkg/id3lib/Makefile (rev 0)
+++ csw/mgar/pkg/id3lib/Makefile 2011-03-03 13:26:16 UTC (rev 13546)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Property changes on: csw/mgar/pkg/id3lib/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/id3lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/id3lib/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/id3lib/trunk/Makefile 2011-03-03 13:26:16 UTC (rev 13546)
@@ -0,0 +1,48 @@
+# $Id$
+NAME = id3lib
+VERSION = 3.8.3
+CATEGORIES = lib
+
+DESCRIPTION = Library for manipulating ID3v1/v1.1 and ID3v2 tags
+define BLURB
+endef
+
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES = $(DISTNAME).tar.gz
+
+PATCHFILES += 0001-Make-pointer-types-match.patch
+PATCHFILES += 0002-Do-not-use-Wall.patch
+PATCHFILES += 0003-Work-around-conversion-in-iostream.patch
+
+PACKAGES += CSWlibid3-3-8-3
+CATALOGNAME_CSWlibid3-3-8-3 = libid3_3_8_3
+SPKG_DESC_CSWlibid3-3-8-3 = Library for manipulating ID3v1/v1.1 and ID3v2 tags, libid3-3.8.so.3
+PKGFILES_CSWlibid3-3-8-3 = $(call baseisadirs,$(libdir),libid3-3\.8\.so\.3(\.\d+)*)
+
+PACKAGES += CSWlibid3-dev
+CATALOGNAME_CSWlibid3-dev = libid3_dev
+SPKG_DESC_CSWlibid3-dev = Development files for libid3.so
+PKGFILES_CSWlibid3-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibid3-dev += CSWlibid3-3-8-3
+
+PACKAGES += CSWlibid3-utils
+CATALOGNAME_CSWlibid3-utils = libid3_utils
+SPKG_DESC_CSWlibid3-utils = Utilities for manipulating ID3v2 tags
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibid3-3-8-3 += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWlibid3-3-8-3
+RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibid3-utils += CSWzlib
+OBSOLETES_CSWlibid3-utils = CSWid3lib
+
+EXTRA_LDFLAGS = -norunpath
+
+BUILD64 = 1
+NOISAEXEC = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+
+TEST_TARGET = check
+
+MERGE_DIRS_isa-extra = $(libdir)
+
+include gar/category.mk
Property changes on: csw/mgar/pkg/id3lib/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/id3lib/trunk/checksums
===================================================================
--- csw/mgar/pkg/id3lib/trunk/checksums (rev 0)
+++ csw/mgar/pkg/id3lib/trunk/checksums 2011-03-03 13:26:16 UTC (rev 13546)
@@ -0,0 +1 @@
+19f27ddd2dda4b2d26a559a4f0f402a7 id3lib-3.8.3.tar.gz
Added: csw/mgar/pkg/id3lib/trunk/files/0001-Make-pointer-types-match.patch
===================================================================
--- csw/mgar/pkg/id3lib/trunk/files/0001-Make-pointer-types-match.patch (rev 0)
+++ csw/mgar/pkg/id3lib/trunk/files/0001-Make-pointer-types-match.patch 2011-03-03 13:26:16 UTC (rev 13546)
@@ -0,0 +1,28 @@
+From b86576549ffe181d4115db418c836a284ce7d226 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 3 Mar 2011 12:11:57 +0100
+Subject: [PATCH 1/2] Make pointer types match
+
+---
+ src/tag_file.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tag_file.cpp b/src/tag_file.cpp
+index 09461fc..b3cb304 100644
+--- a/src/tag_file.cpp
++++ b/src/tag_file.cpp
+@@ -285,9 +285,9 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream& file)
+ uchar tmpBuffer[BUFSIZ];
+ while (file)
+ {
+- file.read(tmpBuffer, BUFSIZ);
++ file.read( (char *) tmpBuffer, BUFSIZ);
+ size_t nBytes = file.gcount();
+- tmpOut.write(tmpBuffer, nBytes);
++ tmpOut.write( (char *) tmpBuffer, nBytes);
+ }
+
+ close(fd); //closes the file
+--
+1.7.3.2
+
Added: csw/mgar/pkg/id3lib/trunk/files/0002-Do-not-use-Wall.patch
===================================================================
--- csw/mgar/pkg/id3lib/trunk/files/0002-Do-not-use-Wall.patch (rev 0)
+++ csw/mgar/pkg/id3lib/trunk/files/0002-Do-not-use-Wall.patch 2011-03-03 13:26:16 UTC (rev 13546)
@@ -0,0 +1,25 @@
+From 8f88354e18616ecb05d7b89444b480f62a579a31 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 3 Mar 2011 12:13:50 +0100
+Subject: [PATCH 2/2] Do not use -Wall
+
+---
+ configure | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 37b66f3..dd88113 100755
+--- a/configure
++++ b/configure
+@@ -11616,7 +11616,7 @@ fi
+ subdirs="$subdirs zlib"
+
+
+-CFLAGS="$CFLAGS -Wall"
++# CFLAGS="$CFLAGS -Wall"
+
+ ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile include/Makefile include/id3/Makefile id3com/Makefile id3com/Sample/Makefile src/Makefile examples/Makefile prj/Makefile libprj/Makefile"
+ cat >confcache <<\_ACEOF
+--
+1.7.3.2
+
Added: csw/mgar/pkg/id3lib/trunk/files/0003-Work-around-conversion-in-iostream.patch
===================================================================
--- csw/mgar/pkg/id3lib/trunk/files/0003-Work-around-conversion-in-iostream.patch (rev 0)
+++ csw/mgar/pkg/id3lib/trunk/files/0003-Work-around-conversion-in-iostream.patch 2011-03-03 13:26:16 UTC (rev 13546)
@@ -0,0 +1,36 @@
+From 068b7f19083b5fcd37890ad5a55cd2e4af20db9a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 3 Mar 2011 12:33:24 +0100
+Subject: [PATCH] Work around conversion in iostream
+
+---
+ examples/test_io.cpp | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/examples/test_io.cpp b/examples/test_io.cpp
+index bee1a27..bbefb92 100644
+--- a/examples/test_io.cpp
++++ b/examples/test_io.cpp
+@@ -11,6 +11,7 @@
+ #include <id3/io_strings.h>
+ #include <id3/utils.h>
+
++using std::cin;
+ using std::cout;
+ using std::endl;
+ using std::cerr;
+@@ -116,7 +117,10 @@ main(size_t argc, const char** argv)
+ cout << "binary number:";
+ for (size_t i = 0; i < number.size(); ++i)
+ {
+- cout << " 0x" << hex << (size_t) (0xFF & number[i]) << dec;
++ cout << " 0x";
++ cout.flags(ios::hex);
++ cout << (size_t) (0xFF & number[i]);
++ cout.flags(ios::dec);
+ }
+ cout << endl;
+
+--
+1.7.3.2
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list