mediainfo 0.7.82
authorYaakov Selkowitz <yselkowi@redhat.com>
Sun, 31 Jan 2016 09:01:36 +0000 (03:01 -0600)
committerYaakov Selkowitz <yselkowi@redhat.com>
Sun, 31 Jan 2016 09:01:36 +0000 (03:01 -0600)
0.7.58-cygwin.patch [deleted file]
0.7.58-vpath.patch [deleted file]
mediainfo.cygport

diff --git a/0.7.58-cygwin.patch b/0.7.58-cygwin.patch
deleted file mode 100644 (file)
index 9bd6a7d..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
---- origsrc/MediaInfo/Source/GUI/Common/GUI_Main_Common_Core.h 2012-05-22 01:53:02.000000000 -0500\r
-+++ src/MediaInfo/Source/GUI/Common/GUI_Main_Common_Core.h     2012-06-01 00:40:08.624430900 -0500\r
-@@ -40,6 +40,8 @@\r
- using namespace MediaInfoNameSpace;\r
- //---------------------------------------------------------------------------\r
\r
-+#undef _C\r
-+\r
- //---------------------------------------------------------------------------\r
- class Core;\r
- //---------------------------------------------------------------------------\r
---- origsrc/MediaInfo/Source/GUI/Common/GUI_Main_Easy_Box_Core.h       2012-05-22 01:53:18.000000000 -0500\r
-+++ src/MediaInfo/Source/GUI/Common/GUI_Main_Easy_Box_Core.h   2012-06-01 00:40:34.914769300 -0500\r
-@@ -30,6 +30,8 @@\r
- #include "Common/Core.h"\r
- //---------------------------------------------------------------------------\r
\r
-+#undef _C\r
-+\r
- //---------------------------------------------------------------------------\r
- class GUI_Main_Easy_Core;\r
- //---------------------------------------------------------------------------\r
---- origsrc/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h   2012-05-11 02:50:31.000000000 -0500\r
-+++ src/MediaInfoLib/Source/MediaInfo/MediaInfo_Events.h       2012-05-31 22:37:38.087129100 -0500\r
-@@ -193,7 +193,7 @@\r
- /* The callback function                                                   */\r
- /***************************************************************************/\r
\r
--#if !defined(__WINDOWS__)\r
-+#if !defined(__WINDOWS__) && !defined(__stdcall)\r
-     #define __stdcall\r
- #endif //!defined(__WINDOWS__)\r
\r
-\r
---- origsrc/ZenLib/Source/ZenLib/int128s.cpp   2012-05-11 02:57:24.000000000 -0500\r
-+++ src/ZenLib/Source/ZenLib/int128s.cpp       2012-05-31 22:13:59.181951100 -0500\r
-@@ -60,7 +60,7 @@\r
-     defined (__FreeBSD__)    || defined (__OpenBSD__)   || \\r
-     defined (__NetBSD__)     || defined (__DragonFly__) || \\r
-     defined (__sparc__)      || defined (__sparc64__)   || \\r
--    defined (__SUNPRO_CC)\r
-+    defined (__SUNPRO_CC)    || defined (__CYGWIN__)\r
-     #define fmodl fmod\r
- #endif\r
- using namespace std;\r
---- origsrc/ZenLib/Source/ZenLib/int128u.cpp   2012-05-11 02:57:24.000000000 -0500\r
-+++ src/ZenLib/Source/ZenLib/int128u.cpp       2012-05-31 22:14:17.686800900 -0500\r
-@@ -60,7 +60,7 @@\r
-     defined (__FreeBSD__)    || defined (__OpenBSD__)   || \\r
-     defined (__NetBSD__)     || defined (__DragonFly__) || \\r
-     defined (__sparc__)      || defined (__sparc64__)   || \\r
--    defined (__SUNPRO_CC)\r
-+    defined (__SUNPRO_CC)    || defined (__CYGWIN__)\r
-     #define fmodl fmod\r
- #endif\r
- using namespace std;\r
diff --git a/0.7.58-vpath.patch b/0.7.58-vpath.patch
deleted file mode 100644 (file)
index 6639edf..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
---- origsrc/MediaInfo/Project/GNU/CLI/Makefile.am      2012-05-11 02:49:42.000000000 -0500
-+++ src/MediaInfo/Project/GNU/CLI/Makefile.am  2012-05-31 23:10:24.131998300 -0500
-@@ -9,4 +9,4 @@ mediainfo_SOURCES = \
- #mediainfo_LDFLAGS     = -no-undefined -version-info 0:0:0
--INCLUDES = -I../../../Source -I../../../../MediaInfoLib/Source -I../../../../ZenLib/Source
-\ No newline at end of file
-+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 = \
- #mediainfo-gui_LDFLAGS     = -no-undefined -version-info 0:0:0
--INCLUDES = -I../../../Source -I../../../../MediaInfoLib/Source -I../../../../ZenLib/Source
-\ No newline at end of file
-+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,4 @@ 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
---- origsrc/MediaInfoLib/Project/GNU/Library/configure.ac      2013-05-11 16:37:39.000000000 -0500
-+++ src/MediaInfoLib/Project/GNU/Library/configure.ac  2013-06-19 03:39:27.323190800 -0500
-@@ -564,8 +564,8 @@ if test "$with_libmd5" = "yes"; then
-       AM_CONDITIONAL(COMPILE_MD5, false)
-       using_libmd5="system"
- else
--      CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/md5"
--      CFLAGS="$CFLAGS -I../../../Source/ThirdParty/md5"
-+      CXXFLAGS="$CXXFLAGS -I$srcdir/../../../Source/ThirdParty/md5"
-+      CFLAGS="$CFLAGS -I$srcdir/../../../Source/ThirdParty/md5"
-       using_libmd5="internal"
-       AM_CONDITIONAL(COMPILE_MD5, true)
- fi
-@@ -582,7 +582,7 @@ if test "$with_libtinyxml2" = "yes"; the
-       AM_CONDITIONAL(COMPILE_TINYXML2, false)
-       using_libtinyxml2="system"
- else
--      CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/tinyxml2"
-+      CXXFLAGS="$CXXFLAGS -I$srcdir/../../../Source/ThirdParty/tinyxml2"
-       using_libtinyxml2="internal"
-       AM_CONDITIONAL(COMPILE_TINYXML2, true)
- fi
-@@ -595,7 +595,7 @@ MediaInfoLib_LibName="$with_libmediainfo
- dnl -------------------------------------------------------------------------
- dnl base64
- dnl
--CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/base64"
-+CXXFLAGS="$CXXFLAGS -I$srcdir/../../../Source/ThirdParty/base64"
- dnl #########################################################################
- dnl ### Compiler specific
---- 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
index 795bd91cb94f0b1a4ad59b5636ac03fe1834c045..d72effaf6924aee8fa86ccbcbf51e51aa1bb6203 100644 (file)
@@ -1,61 +1,65 @@
 WX_VERSION=2.8
-inherit wxwidgets
+inherit qt4-qmake wxwidgets
 
 NAME="mediainfo"
-VERSION=0.7.65
+VERSION=0.7.82
 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.29.tar.bz2"
+HOMEPAGE="http://mediaarea.net/"
+SRC_URI="
+       http://mediaarea.net/download/source/mediainfo/${VERSION}/mediainfo_${VERSION}.tar.xz
+       http://mediaarea.net/download/source/libmediainfo/${VERSION}/libmediainfo_${VERSION}.tar.xz
+       http://mediaarea.net/download/source/libzen/0.4.32/libzen_0.4.32.tar.bz2
+"
 SRC_DIR=.
-PATCH_URI="0.7.58-cygwin.patch  0.7.58-vpath.patch"
 
 PKG_NAMES="${NAME} ${NAME}-gui"
-mediainfo_CONTENTS="usr/bin/mediainfo.exe usr/share/doc/${NAME}/*CLI*"
-mediainfo_gui_CONTENTS="usr/bin/mediainfo-gui.exe usr/share/applications/
-                        usr/share/doc/${NAME}/*GUI* usr/share/pixmaps/"
+mediainfo_CONTENTS="
+       usr/bin/mediainfo.exe
+       usr/share/doc/${NAME}/*CLI*
+"
+mediainfo_gui_CONTENTS="
+       etc/postinstall/
+       usr/bin/mediainfo-gui.exe
+       usr/share/appdata/mediainfo-gui.appdata.xml
+       usr/share/applications/mediainfo-gui.desktop
+       usr/share/doc/${NAME}/*GUI*
+       usr/share/pixmaps/mediainfo.png
+"
 
 src_compile() {
        local subdir
 
+       lndirs
+
        subdir="ZenLib/Project/GNU/Library"
-       CYGCONF_SOURCE="${S}/${subdir}"
-       cd ${CYGCONF_SOURCE}
-       cygautoreconf
-       mkdir -p ${B}/${subdir}
        cd ${B}/${subdir}
+       cygautoreconf
+       CYGCONF_SOURCE=. \
        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
+       cygautoreconf
+       CYGCONF_SOURCE=. \
+       cygconf --disable-shared --with-libcurl --with-libtinyxml2 --without-libmms
        cygmake
 
        subdir="MediaInfo/Project/GNU/CLI"
-       CYGCONF_SOURCE="${S}/${subdir}"
-       cd ${CYGCONF_SOURCE}
-       cygautoreconf
-       mkdir -p ${B}/${subdir}
        cd ${B}/${subdir}
+       cygautoreconf
+       CYGCONF_SOURCE=. \
        cygconf
        cygmake
 
        subdir="MediaInfo/Project/GNU/GUI"
-       CYGCONF_SOURCE="${S}/${subdir}"
-       cd ${CYGCONF_SOURCE}
-       cygautoreconf
-       mkdir -p ${B}/${subdir}
        cd ${B}/${subdir}
+       cygautoreconf
+       CYGCONF_SOURCE=. \
        cygconf --with-wx-config=${WX_CONFIG}
        cygmake
 }
@@ -65,9 +69,9 @@ src_install() {
        cyginstall
        cd ${B}/MediaInfo/Project/GNU/GUI
        cyginstall
+       domenu mediainfo-gui.desktop
 
-       doicon ${S}/MediaInfo/Source/Resource/Image/MediaInfo.png
-       make_desktop_entry mediainfo-gui MediaInfo MediaInfo "AudioVideo;GTK"
+       newicon ${S}/MediaInfo/Source/Resource/Image/MediaInfo.png mediainfo.png
 }
 
 DOCS="MediaInfo/History*.txt MediaInfo/Release/ReadMe*Linux.txt"
This page took 0.025631 seconds and 5 git commands to generate.