mediainfo 0.7.61
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Thu, 1 Nov 2012 21:09:33 +0000 (16:09 -0500)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Thu, 1 Nov 2012 21:09:33 +0000 (16:09 -0500)
Use static in-tree libzen and libmediainfo, as this is an intended scenario
according to upstream and nothing else uses these libraries.

0.7.58-cygwin.patch
0.7.58-vpath.patch
mediainfo-0.7.58-1.cygport [deleted file]
mediainfo-gui.hint [deleted file]
mediainfo.cygport [new file with mode: 0644]
mediainfo.hint [deleted file]

index deb904d94e456adee72942ac691de5e56f70d09e..a9a004aa1e6ff8d556dc84e7267475a730e503ca 100644 (file)
  //---------------------------------------------------------------------------
  class GUI_Main_Easy_Core;
  //---------------------------------------------------------------------------
+--- origsrc/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h   2012-05-11 02:50:31.000000000 -0500
++++ src/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h       2012-05-31 22:37:38.087129100 -0500
+@@ -193,7 +193,7 @@
+ /* The callback function                                                   */
+ /***************************************************************************/
+-#if !defined(__WINDOWS__)
++#if !defined(__WINDOWS__) && !defined(__stdcall)
+     #define __stdcall
+ #endif //!defined(__WINDOWS__)
+
+--- origsrc/ZenLib/Source/ZenLib/int128s.cpp   2012-05-11 02:57:24.000000000 -0500
++++ src/ZenLib/Source/ZenLib/int128s.cpp       2012-05-31 22:13:59.181951100 -0500
+@@ -60,7 +60,7 @@
+     defined (__FreeBSD__)    || defined (__OpenBSD__)   || \
+     defined (__NetBSD__)     || defined (__DragonFly__) || \
+     defined (__sparc__)      || defined (__sparc64__)   || \
+-    defined (__SUNPRO_CC)
++    defined (__SUNPRO_CC)    || defined (__CYGWIN__)
+     #define fmodl fmod
+ #endif
+ using namespace std;
+--- origsrc/ZenLib/Source/ZenLib/int128u.cpp   2012-05-11 02:57:24.000000000 -0500
++++ src/ZenLib/Source/ZenLib/int128u.cpp       2012-05-31 22:14:17.686800900 -0500
+@@ -60,7 +60,7 @@
+     defined (__FreeBSD__)    || defined (__OpenBSD__)   || \
+     defined (__NetBSD__)     || defined (__DragonFly__) || \
+     defined (__sparc__)      || defined (__sparc64__)   || \
+-    defined (__SUNPRO_CC)
++    defined (__SUNPRO_CC)    || defined (__CYGWIN__)
+     #define fmodl fmod
+ #endif
+ using namespace std;
index 5a854251e239df9f7b2b185cadfe474adefaa53c..ed97664d448d98f37621b3934ea13d0eeb953eeb 100644 (file)
@@ -6,7 +6,7 @@
  
 -INCLUDES = -I../../../Source -I../../../../MediaInfoLib/Source -I../../../../ZenLib/Source
 \ No newline at end of file
-+INCLUDES = -I$(srcdir)/../../../Source -I../../../../MediaInfoLib/Source -I../../../../ZenLib/Source
++INCLUDES = -I$(srcdir)/../../../Source -I$(srcdir)/../../../../MediaInfoLib/Source -I$(srcdir)/../../../../ZenLib/Source
 --- origsrc/MediaInfo/Project/GNU/GUI/Makefile.am      2012-05-11 02:49:42.000000000 -0500
 +++ src/MediaInfo/Project/GNU/GUI/Makefile.am  2012-05-31 23:27:05.967215200 -0500
 @@ -22,4 +22,4 @@ mediainfo_gui_SOURCES = \
  
 -INCLUDES = -I../../../Source -I../../../../MediaInfoLib/Source -I../../../../ZenLib/Source
 \ No newline at end of file
-+INCLUDES = -I$(srcdir)/../../../Source -I../../../../MediaInfoLib/Source -I../../../../ZenLib/Source
++INCLUDES = -I$(srcdir)/../../../Source -I$(srcdir)/../../../../MediaInfoLib/Source -I$(srcdir)/../../../../ZenLib/Source
+--- origsrc/MediaInfoLib/Project/GNU/Library/Makefile.am       2012-05-11 02:50:33.000000000 -0500
++++ src/MediaInfoLib/Project/GNU/Library/Makefile.am   2012-05-31 22:46:56.868973900 -0500
+@@ -179,4 +179,5 @@ endif
+ libmediainfo_la_LDFLAGS     = -no-undefined -version-info 0:0:0
+-INCLUDES = -I../../../Source -I../../../../ZenLib/Source
++INCLUDES = -I$(srcdir)/../../../Source -I$(srcdir)/../../../../ZenLib/Source
++INCLUDES += -I$(srcdir)/../../../Source/ThirdParty/base64 -I$(srcdir)/../../../Source/ThirdParty/tinyxml2
+--- origsrc/ZenLib/Project/GNU/Library/Makefile.am     2012-05-18 10:18:52.000000000 -0500
++++ src/ZenLib/Project/GNU/Library/Makefile.am 2012-05-31 22:12:26.558733400 -0500
+@@ -79,4 +79,4 @@ bin_SCRIPTS = libzen-config
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libzen.pc
+-AM_CPPFLAGS = -I../../../Source
++AM_CPPFLAGS = -I$(srcdir)/../../../Source
diff --git a/mediainfo-0.7.58-1.cygport b/mediainfo-0.7.58-1.cygport
deleted file mode 100644 (file)
index 0297670..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-WX_VERSION=2.8
-inherit wxwidgets
-
-
-HOMEPAGE="http://mediainfo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mediainfo/${PN}_${PV}.tar.bz2"
-SRC_DIR="MediaInfo"
-
-PKG_NAMES="0.7.58-cygwin.patch
-           0.7.58-vpath.patch"
-
-PKG_NAMES="${PN} ${PN}-gui"
-mediainfo_CONTENTS="usr/bin/mediainfo.exe usr/share/doc/${PN}/*CLI*"
-mediainfo_gui_CONTENTS="usr/bin/mediainfo-gui.exe usr/share/applications/
-                        usr/share/doc/${PN}/*GUI* usr/share/pixmaps/"
-
-src_compile() {
-       CYGCONF_SOURCE="${S}/Project/GNU/CLI"
-       cd ${CYGCONF_SOURCE}
-       cygautoreconf
-       mkdir -p ${B}/CLI
-       cd ${B}/CLI
-       cygconf
-       cygmake
-
-       CYGCONF_SOURCE="${S}/Project/GNU/GUI"
-       cd ${CYGCONF_SOURCE}
-       cygautoreconf
-       mkdir -p ${B}/GUI
-       cd ${B}/GUI
-       cygconf --with-wx-config=${WX_CONFIG}
-       cygmake
-}
-
-src_install() {
-       cd ${B}/CLI
-       cyginstall
-       cd ${B}/GUI
-       cyginstall
-
-       doicon ${S}/Source/Resource/Image/MediaInfo.png
-       make_desktop_entry mediainfo-gui MediaInfo MediaInfo "AudioVideo;GTK"
-}
-
-DOCS="History*.txt Release/ReadMe*Linux.txt"
diff --git a/mediainfo-gui.hint b/mediainfo-gui.hint
deleted file mode 100644 (file)
index 2eb75f3..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-category: Audio Video
-requires: libgcc1 libmediainfo0 libstdc++6 libwx_baseu2.8_0 libwx_gtk2u2.8_0 libzen0
-external-source: mediainfo
-sdesc: "Displays data for multimedia files (graphical interface)"
-ldesc: "MediaInfo is a convenient unified display of the most relevant 
-technical and tag data for video and audio files."
diff --git a/mediainfo.cygport b/mediainfo.cygport
new file mode 100644 (file)
index 0000000..7271e25
--- /dev/null
@@ -0,0 +1,73 @@
+WX_VERSION=2.8
+inherit wxwidgets
+
+NAME="mediainfo"
+VERSION=0.7.61
+RELEASE=1
+CATEGORY="Audio Video"
+SUMMARY="Displays multimedia file information"
+DESCRIPTION="MediaInfo is a convenient unified display of the most relevant
+technical and tag data for video and audio files."
+HOMEPAGE="http://mediainfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mediainfo/mediainfo_${VERSION}.tar.bz2
+         mirror://sourceforge/mediainfo/libmediainfo_${VERSION}.tar.bz2
+         mirror://sourceforge/zenlib/libzen_0.4.28.tar.bz2"
+SRC_DIR=.
+PATCH_URI="0.7.58-cygwin.patch  0.7.58-vpath.patch"
+
+PKG_NAMES="${PN} ${PN}-gui"
+mediainfo_CONTENTS="usr/bin/mediainfo.exe usr/share/doc/${PN}/*CLI*"
+mediainfo_gui_CONTENTS="usr/bin/mediainfo-gui.exe usr/share/applications/
+                        usr/share/doc/${PN}/*GUI* usr/share/pixmaps/"
+
+src_compile() {
+       local subdir
+
+       subdir="ZenLib/Project/GNU/Library"
+       CYGCONF_SOURCE="${S}/${subdir}"
+       cd ${CYGCONF_SOURCE}
+       cygautoreconf
+       mkdir -p ${B}/${subdir}
+       cd ${B}/${subdir}
+       cygconf --disable-shared
+       cygmake
+
+       subdir="MediaInfoLib/Project/GNU/Library"
+       CYGCONF_SOURCE="${S}/${subdir}"
+       cd ${CYGCONF_SOURCE}
+       cygautoreconf
+       mkdir -p ${B}/${subdir}
+       cd ${B}/${subdir}
+       cygconf --disable-shared --with-libcurl --with-libmms
+       cygmake
+
+       subdir="MediaInfo/Project/GNU/CLI"
+       CYGCONF_SOURCE="${S}/${subdir}"
+       cd ${CYGCONF_SOURCE}
+       cygautoreconf
+       mkdir -p ${B}/${subdir}
+       cd ${B}/${subdir}
+       cygconf
+       cygmake
+
+       subdir="MediaInfo/Project/GNU/GUI"
+       CYGCONF_SOURCE="${S}/${subdir}"
+       cd ${CYGCONF_SOURCE}
+       cygautoreconf
+       mkdir -p ${B}/${subdir}
+       cd ${B}/${subdir}
+       cygconf --with-wx-config=${WX_CONFIG}
+       cygmake
+}
+
+src_install() {
+       cd ${B}/MediaInfo/Project/GNU/CLI
+       cyginstall
+       cd ${B}/MediaInfo/Project/GNU/GUI
+       cyginstall
+
+       doicon ${S}/MediaInfo/Source/Resource/Image/MediaInfo.png
+       make_desktop_entry mediainfo-gui MediaInfo MediaInfo "AudioVideo;GTK"
+}
+
+DOCS="MediaInfo/History*.txt MediaInfo/Release/ReadMe*Linux.txt"
diff --git a/mediainfo.hint b/mediainfo.hint
deleted file mode 100644 (file)
index 6e3b008..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-category: Audio Video
-requires: libgcc1 libmediainfo0 libstdc++6 libzen0
-sdesc: "Displays data for multimedia files (command-line interface)"
-ldesc: "MediaInfo is a convenient unified display of the most relevant 
-technical and tag data for video and audio files."
This page took 0.028183 seconds and 5 git commands to generate.