[csw-devel] SF.net SVN: gar:[14992] csw/mgar/pkg/libmp4v2/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Jul 6 15:21:01 CEST 2011
Revision: 14992
http://gar.svn.sourceforge.net/gar/?rev=14992&view=rev
Author: dmichelsen
Date: 2011-07-06 13:21:00 +0000 (Wed, 06 Jul 2011)
Log Message:
-----------
libmp4v2: Update to mGAR v2, add patches, general rework
Modified Paths:
--------------
csw/mgar/pkg/libmp4v2/trunk/Makefile
csw/mgar/pkg/libmp4v2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libmp4v2/trunk/files/0001-Use-const-char-where-necessary.patch
csw/mgar/pkg/libmp4v2/trunk/files/0002-Add-headers-and-libs-as-required-to-testsuite.patch
csw/mgar/pkg/libmp4v2/trunk/files/0003-Keep-norunpath-for-C-linkage.patch
csw/mgar/pkg/libmp4v2/trunk/files/0004-Add-libgnugetopt.so-to-executables.patch
Removed Paths:
-------------
csw/mgar/pkg/libmp4v2/trunk/files/CSWlibmp4v2.gspec
Property Changed:
----------------
csw/mgar/pkg/libmp4v2/trunk/
Property changes on: csw/mgar/pkg/libmp4v2/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/libmp4v2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmp4v2/trunk/Makefile 2011-07-06 12:56:00 UTC (rev 14991)
+++ csw/mgar/pkg/libmp4v2/trunk/Makefile 2011-07-06 13:21:00 UTC (rev 14992)
@@ -4,25 +4,43 @@
DESCRIPTION = A free library to read and manipulate the mp4 container format
define BLURB
-The mpeg4ip package, available from http://mpeg4ip.net/ contains a very useful piece of software, the libmp4v2 package. Unfortunately the mpeg4ip package also contains software that are covered by patents in some juridistictions and therefore the policy of several different free software distributions stops it's inclusion.
-
-Therefore the author of this software has prepared this redistribution of the libmp4v2 package. It cotains only code to read and manipulate the mp4 container format, and is free from patent issues to the best of his knowledge.
+ The mpeg4ip package, available from http://mpeg4ip.net/ contains a very useful piece of software,
+ the libmp4v2 package. Unfortunately the mpeg4ip package also contains software that are covered by
+ patents in some juridistictions and therefore the policy of several different free software
+ distributions stops it's inclusion.
+ Therefore the author of this software has prepared this redistribution of the libmp4v2 package.
+ It cotains only code to read and manipulate the mp4 container format, and is free from patent
+ issues to the best of his knowledge.
endef
-MASTER_SITES = http://resare.com/libmp4v2/dist/
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += $(call admfiles,CSWlibmp4v2)
+SF_PROJ = easytag
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES = $(DISTNAME).tar.bz2
+
PATCHFILES = use-inttypes.h.diff
PATCHFILES += mp4util.diff
PATCHFILES += include-limits.h.diff
-PATCHFILES += stdint-to-inttypes.h.diff
+PATCHFILES += linux-stdints.diff
+PATCHFILES += 0001-Use-const-char-where-necessary.patch
+PATCHFILES += 0002-Add-headers-and-libs-as-required-to-testsuite.patch
+PATCHFILES += 0003-Keep-norunpath-for-C-linkage.patch
+PATCHFILES += 0004-Add-libgnugetopt.so-to-executables.patch
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PACKAGES += CSWlibmp4v2-0
+SPKG_DESC_CSWlibmp4v2-0 = A free library to read and manipulate the mp4 container format, libmp4v2.so.0
+PKGFILES_CSWlibmp4v2-0 += $(call pkgfiles_lib,libmp4v2.so.0)
-GARCOMPILER = GNU
+PACKAGES += CSWlibmp4v2-dev
+SPKG_DESC_CSWlibmp4v2-dev = Development files for libmp4v2.so.0
+PKGFILES_CSWlibmp4v2-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibmp4v2-dev += CSWlibmp4v2-0
-CONFIGURE_ARGS = $(DIRPATHS)
-GNU_CC_HOME = /opt/csw/gcc3
+PACKAGES += CSWlibmp4v2-utils
+SPKG_DESC_CSWlibmp4v2-utils = Utility programs for mp4 file manipulation
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibgnugetopt
+RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibmp4v2-0
+EXTRA_LINKER_FLAGS += -norunpath
+
include gar/category.mk
Modified: csw/mgar/pkg/libmp4v2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libmp4v2/trunk/checksums 2011-07-06 12:56:00 UTC (rev 14991)
+++ csw/mgar/pkg/libmp4v2/trunk/checksums 2011-07-06 13:21:00 UTC (rev 14992)
@@ -1,5 +1 @@
-90eb2b0940ebe02ef81b7a60530beaee download/libmp4v2-1.5.0.1.tar.bz2
-0cf8210f00723eb29f40edc2d75b96b6 download/CSWlibmp4v2.gspec
-cab745cefe4239d58af6a068125a2830 download/use-inttypes.h.diff
-4109306447d4ccec029ee5aac8f50d4a download/mp4util.diff
-a9b7b14b47d7e7830368cb51082a925b download/include-limits.h.diff
+90eb2b0940ebe02ef81b7a60530beaee libmp4v2-1.5.0.1.tar.bz2
Added: csw/mgar/pkg/libmp4v2/trunk/files/0001-Use-const-char-where-necessary.patch
===================================================================
--- csw/mgar/pkg/libmp4v2/trunk/files/0001-Use-const-char-where-necessary.patch (rev 0)
+++ csw/mgar/pkg/libmp4v2/trunk/files/0001-Use-const-char-where-necessary.patch 2011-07-06 13:21:00 UTC (rev 14992)
@@ -0,0 +1,25 @@
+From 191a900264f5b85de5533fd9f341a36d250c8c41 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 6 Jul 2011 10:29:34 +0200
+Subject: [PATCH] Use const char where necessary
+
+---
+ rtphint.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/rtphint.cpp b/rtphint.cpp
+index 6a193ac..def6998 100644
+--- a/rtphint.cpp
++++ b/rtphint.cpp
+@@ -314,7 +314,7 @@ void MP4RtpHintTrack::GetPayload(
+ char **ppEncodingParams)
+ {
+ const char* pRtpMap;
+- char* pSlash;
++ const char* pSlash;
+ u_int32_t length;
+ InitPayload();
+
+--
+1.7.5.4
+
Added: csw/mgar/pkg/libmp4v2/trunk/files/0002-Add-headers-and-libs-as-required-to-testsuite.patch
===================================================================
--- csw/mgar/pkg/libmp4v2/trunk/files/0002-Add-headers-and-libs-as-required-to-testsuite.patch (rev 0)
+++ csw/mgar/pkg/libmp4v2/trunk/files/0002-Add-headers-and-libs-as-required-to-testsuite.patch 2011-07-06 13:21:00 UTC (rev 14992)
@@ -0,0 +1,220 @@
+From 0e4f7bfaa59526be55156b3fae29fc1f46c6caae Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 6 Jul 2011 10:48:32 +0200
+Subject: [PATCH] Add headers and libs as required to testsuite
+
+---
+ test/Makefile.am | 2 +-
+ test/Makefile.in | 14 +++++--
+ test/mp4broadcaster | 99 +++++++++++++++++++++++++++++++++++++++++++++++
+ test/mp4broadcaster.cpp | 2 +
+ 4 files changed, 112 insertions(+), 5 deletions(-)
+ create mode 100755 test/mp4broadcaster
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 14e1604..86ece8e 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -7,7 +7,7 @@ c_api_SOURCES = c_api.c
+ c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++
+
+ mp4broadcaster_SOURCES = mp4broadcaster.cpp
+-mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la
++mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv
+
+ nullcreate_SOURCES = nullcreate.cpp
+ nullcreate_LDADD = $(top_builddir)/libmp4v2.la
+diff --git a/test/Makefile.in b/test/Makefile.in
+index 1d553c6..e2bde38 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -122,6 +122,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -139,6 +140,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
+@@ -146,12 +148,9 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+@@ -168,23 +167,30 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -193,7 +199,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/util
+ c_api_SOURCES = c_api.c
+ c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++
+ mp4broadcaster_SOURCES = mp4broadcaster.cpp
+-mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la
++mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv
+ nullcreate_SOURCES = nullcreate.cpp
+ nullcreate_LDADD = $(top_builddir)/libmp4v2.la
+ nullvplayer_SOURCES = nullvplayer.cpp
+diff --git a/test/mp4broadcaster b/test/mp4broadcaster
+new file mode 100755
+index 0000000..df62aa1
+--- /dev/null
++++ b/test/mp4broadcaster
+@@ -0,0 +1,99 @@
++#! /bin/bash
++
++# mp4broadcaster - temporary wrapper script for .libs/mp4broadcaster
++# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
++#
++# The mp4broadcaster program cannot be directly executed until all the libtool
++# libraries that it depends on are installed.
++#
++# This wrapper script should never be moved out of the build directory.
++# If it is, it will not operate correctly.
++
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='/opt/csw/bin/gsed -e 1s/^X//'
++sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++relink_command=""
++
++# This environment variable determines our operation mode.
++if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
++ # install mode needs the following variable:
++ notinst_deplibs=' ../libmp4v2.la'
++else
++ # When we are sourced in execute mode, $file and $echo are already set.
++ if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
++ echo="echo"
++ file="$0"
++ # Make sure echo works.
++ if test "X$1" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++ # Yippee, $echo works!
++ :
++ else
++ # Restart under the correct shell, and then maybe $echo will work.
++ exec /bin/bash "$0" --no-reexec ${1+"$@"}
++ fi
++ fi
++
++ # Find the directory that this script lives in.
++ thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++ test "x$thisdir" = "x$file" && thisdir=.
++
++ # Follow symbolic links until we get to the real thisdir.
++ file=`ls -ld "$file" | /opt/csw/bin/gsed -n 's/.*-> //p'`
++ while test -n "$file"; do
++ destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
++
++ # If there was a directory component, then change thisdir.
++ if test "x$destdir" != "x$file"; then
++ case "$destdir" in
++ [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
++ *) thisdir="$thisdir/$destdir" ;;
++ esac
++ fi
++
++ file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++ file=`ls -ld "$thisdir/$file" | /opt/csw/bin/gsed -n 's/.*-> //p'`
++ done
++
++ # Try to get the absolute directory name.
++ absdir=`cd "$thisdir" && pwd`
++ test -n "$absdir" && thisdir="$absdir"
++
++ program='mp4broadcaster'
++ progdir="$thisdir/.libs"
++
++
++ if test -f "$progdir/$program"; then
++ # Add our own library path to LD_LIBRARY_PATH
++ LD_LIBRARY_PATH="/home/dam/mgar/pkg/libmp4v2/trunk/work/solaris9-sparc/build-isa-sparcv8/libmp4v2-1.5.0.1/.libs:$LD_LIBRARY_PATH"
++
++ # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
++ # The second colon is a workaround for a bug in BeOS R4 sed
++ LD_LIBRARY_PATH=`$echo "X$LD_LIBRARY_PATH" | $Xsed -e 's/::*$//'`
++
++ export LD_LIBRARY_PATH
++
++ if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
++ # Run the actual program with our arguments.
++
++ exec "$progdir/$program" ${1+"$@"}
++
++ $echo "$0: cannot exec $program ${1+"$@"}"
++ exit 1
++ fi
++ else
++ # The program doesn't exist.
++ $echo "$0: error: \`$progdir/$program' does not exist" 1>&2
++ $echo "This script is just a wrapper for $program." 1>&2
++ echo "See the libtool documentation for more information." 1>&2
++ exit 1
++ fi
++fi
+diff --git a/test/mp4broadcaster.cpp b/test/mp4broadcaster.cpp
+index 38b4c9c..8a8cee9 100644
+--- a/test/mp4broadcaster.cpp
++++ b/test/mp4broadcaster.cpp
+@@ -21,6 +21,8 @@
+
+ #include "mpeg4ip.h"
+ #include <arpa/inet.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include "mp4.h"
+
+ // forward declarations
+--
+1.7.5.4
+
Added: csw/mgar/pkg/libmp4v2/trunk/files/0003-Keep-norunpath-for-C-linkage.patch
===================================================================
--- csw/mgar/pkg/libmp4v2/trunk/files/0003-Keep-norunpath-for-C-linkage.patch (rev 0)
+++ csw/mgar/pkg/libmp4v2/trunk/files/0003-Keep-norunpath-for-C-linkage.patch 2011-07-06 13:21:00 UTC (rev 14992)
@@ -0,0 +1,25 @@
+From d47639eb2005c28aaaeed453189b8e1e9f4e30b1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 6 Jul 2011 11:16:04 +0200
+Subject: [PATCH] Keep -norunpath for C++ linkage
+
+---
+ ltmain.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 06823e0..80f9e41 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -1623,7 +1623,7 @@ EOF
+ # -pg pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+- -t[45]*|-txscale*|@*)
++ -t[45]*|-txscale*|@*|-norunpath)
+
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+--
+1.7.5.4
+
Added: csw/mgar/pkg/libmp4v2/trunk/files/0004-Add-libgnugetopt.so-to-executables.patch
===================================================================
--- csw/mgar/pkg/libmp4v2/trunk/files/0004-Add-libgnugetopt.so-to-executables.patch (rev 0)
+++ csw/mgar/pkg/libmp4v2/trunk/files/0004-Add-libgnugetopt.so-to-executables.patch 2011-07-06 13:21:00 UTC (rev 14992)
@@ -0,0 +1,135 @@
+From 0dec5ae5d46a3708ff6ad6f6338e4f9db4984ec6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 6 Jul 2011 14:53:50 +0200
+Subject: [PATCH] Add libgnugetopt.so to executables
+
+---
+ test/Makefile.am | 10 +++++-----
+ test/Makefile.in | 10 +++++-----
+ util/Makefile.am | 14 +++++++-------
+ util/Makefile.in | 14 +++++++-------
+ 4 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 86ece8e..758ae6f 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -7,17 +7,17 @@ c_api_SOURCES = c_api.c
+ c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++
+
+ mp4broadcaster_SOURCES = mp4broadcaster.cpp
+-mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv
++mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv -lgnugetopt
+
+ nullcreate_SOURCES = nullcreate.cpp
+-nullcreate_LDADD = $(top_builddir)/libmp4v2.la
++nullcreate_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ nullvplayer_SOURCES = nullvplayer.cpp
+-nullvplayer_LDADD = $(top_builddir)/libmp4v2.la
++nullvplayer_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ urltrack_SOURCES = urltrack.cpp
+-urltrack_LDADD = $(top_builddir)/libmp4v2.la
++urltrack_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ mp4clip_SOURCES = mp4clip.cpp
+-mp4clip_LDADD = $(top_builddir)/libmp4v2.la
++mp4clip_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+diff --git a/test/Makefile.in b/test/Makefile.in
+index e2bde38..e72699f 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -199,15 +199,15 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/util
+ c_api_SOURCES = c_api.c
+ c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++
+ mp4broadcaster_SOURCES = mp4broadcaster.cpp
+-mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv
++mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv -lgnugetopt
+ nullcreate_SOURCES = nullcreate.cpp
+-nullcreate_LDADD = $(top_builddir)/libmp4v2.la
++nullcreate_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ nullvplayer_SOURCES = nullvplayer.cpp
+-nullvplayer_LDADD = $(top_builddir)/libmp4v2.la
++nullvplayer_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ urltrack_SOURCES = urltrack.cpp
+-urltrack_LDADD = $(top_builddir)/libmp4v2.la
++urltrack_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ mp4clip_SOURCES = mp4clip.cpp
+-mp4clip_LDADD = $(top_builddir)/libmp4v2.la
++mp4clip_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ all: all-am
+
+ .SUFFIXES:
+diff --git a/util/Makefile.am b/util/Makefile.am
+index 0ea0af3..de43e64 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -6,25 +6,25 @@ bin_PROGRAMS = mp4dump mp4extract mp4info mp4trackdump mp4tags mp4art
+ check_PROGRAMS = mp4syncfiles
+
+ mp4dump_SOURCES = mp4dump.cpp mpeg4ip_getopt.h
+-mp4dump_LDADD = $(top_builddir)/libmp4v2.la
++mp4dump_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ mp4extract_SOURCES = mp4extract.cpp mpeg4ip_getopt.h
+-mp4extract_LDADD = $(top_builddir)/libmp4v2.la
++mp4extract_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ mp4info_SOURCES = mp4info.cpp mpeg4ip_getopt.h
+-mp4info_LDADD = $(top_builddir)/libmp4v2.la
++mp4info_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ mp4trackdump_SOURCES = mp4trackdump.cpp mpeg4ip_getopt.h
+-mp4trackdump_LDADD = $(top_builddir)/libmp4v2.la
++mp4trackdump_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ mp4tags_SOURCES = mp4tags.cpp mpeg4ip_getopt.h
+-mp4tags_LDADD = $(top_builddir)/libmp4v2.la
++mp4tags_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ mp4art_SOURCES = mp4art.cpp mpeg4ip_getopt.h
+-mp4art_LDADD = $(top_builddir)/libmp4v2.la
++mp4art_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ mp4syncfiles_SOURCES = mp4syncfiles.cpp
+-mp4syncfiles_LDADD = $(top_builddir)/libmp4v2.la
++mp4syncfiles_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+
+ EXTRA_DIST = mp4dump60.dsp \
+ mp4info.dsp mp4tags.dsp
+diff --git a/util/Makefile.in b/util/Makefile.in
+index b52ce56..67973bf 100644
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -199,19 +199,19 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ INCLUDES = -I$(top_srcdir)
+ mp4dump_SOURCES = mp4dump.cpp mpeg4ip_getopt.h
+-mp4dump_LDADD = $(top_builddir)/libmp4v2.la
++mp4dump_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ mp4extract_SOURCES = mp4extract.cpp mpeg4ip_getopt.h
+-mp4extract_LDADD = $(top_builddir)/libmp4v2.la
++mp4extract_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ mp4info_SOURCES = mp4info.cpp mpeg4ip_getopt.h
+-mp4info_LDADD = $(top_builddir)/libmp4v2.la
++mp4info_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ mp4trackdump_SOURCES = mp4trackdump.cpp mpeg4ip_getopt.h
+-mp4trackdump_LDADD = $(top_builddir)/libmp4v2.la
++mp4trackdump_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ mp4tags_SOURCES = mp4tags.cpp mpeg4ip_getopt.h
+-mp4tags_LDADD = $(top_builddir)/libmp4v2.la
++mp4tags_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ mp4art_SOURCES = mp4art.cpp mpeg4ip_getopt.h
+-mp4art_LDADD = $(top_builddir)/libmp4v2.la
++mp4art_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ mp4syncfiles_SOURCES = mp4syncfiles.cpp
+-mp4syncfiles_LDADD = $(top_builddir)/libmp4v2.la
++mp4syncfiles_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt
+ EXTRA_DIST = mp4dump60.dsp \
+ mp4info.dsp mp4tags.dsp
+
+--
+1.7.5.4
+
Deleted: csw/mgar/pkg/libmp4v2/trunk/files/CSWlibmp4v2.gspec
===================================================================
--- csw/mgar/pkg/libmp4v2/trunk/files/CSWlibmp4v2.gspec 2011-07-06 12:56:00 UTC (rev 14991)
+++ csw/mgar/pkg/libmp4v2/trunk/files/CSWlibmp4v2.gspec 2011-07-06 13:21:00 UTC (rev 14992)
@@ -1,4 +0,0 @@
-%var bitname libmp4v2
-%var pkgname CSWlibmp4v2
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYING
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