[arch-commits] Commit in libmediainfo/trunk (2 files)

[Johannes Löthberg]

    Date: Thursday, November 2, 2017 @ 19:28:36
  Author: demize
Revision: 265211

upgpkg: libmediainfo 17.10-1

Modified:
  libmediainfo/trunk/PKGBUILD
Deleted:
  libmediainfo/trunk/libmediainfo-0.7.50-libmms.patch

----------------------------------+
 PKGBUILD                         |   36 ++++++++++++++++----------
 libmediainfo-0.7.50-libmms.patch |   50 -------------------------------------
 2 files changed, 22 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-02 18:37:44 UTC (rev 265210)
+++ PKGBUILD	2017-11-02 19:28:36 UTC (rev 265211)
@@ -1,32 +1,40 @@
 # $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer:  hydro <hydro at freenet.de>
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor:  hydro <hydro at freenet.de>
 
 pkgname=libmediainfo
-pkgver=0.7.99
+pkgver=17.10
 pkgrel=1
+
 pkgdesc="shared library for mediainfo"
+url="http://mediaarea.net"
 arch=('i686' 'x86_64')
-url="http://mediaarea.net"
 license=('GPL')
-depends=( 'curl' 'libmms' 'libzen')
+
+depends=('curl' 'libmms' 'libzen')
 makedepends=('libtool' 'automake' 'autoconf')
-source=(https://mediaarea.net/download/source/libmediainfo/$pkgver/libmediainfo_$pkgver.tar.bz2
-	libmediainfo-0.7.50-libmms.patch)
-sha256sums=('5b9b248cb27c1c1a0e5eba72ee64512578567884b1470e73fc45c3ebebb48ea3'
-            '0adfbac0efee13e1f58dcfa5d2e50b3bc30029a9b1cf812e2d62d1e3308beeeb')
 
+source=(https://mediaarea.net/download/source/libmediainfo/$pkgver/libmediainfo_$pkgver.tar.xz)
+
+sha256sums=('60b018fcd8acd249c5316670bdf1c85abc166fb9c340e84da834b1332a59a102')
+
 build() {
-  cd "$srcdir"/MediaInfoLib/Project/GNU/Library
+  cd MediaInfoLib/Project/GNU/Library
+
   sh ./autogen.sh
-  ./configure --prefix=/usr --enable-shared --disable-static --with-libcurl --with-libmms
-  make clean
-  (cd ../../.. && patch -p1 <"$srcdir"/libmediainfo-0.7.50-libmms.patch)
+  ./configure --prefix=/usr \
+              --enable-shared \
+              --disable-static \
+              --with-libcurl \
+              --with-libmms
+
   make
 }
 
 package() {
-  cd "$srcdir"/MediaInfoLib/Project/GNU/Library
+  cd MediaInfoLib/Project/GNU/Library
+
   make DESTDIR="$pkgdir" install
   for i in MediaInfo MediaInfoDLL; do
     install -dm 755 "$pkgdir"/usr/include/$i

Deleted: libmediainfo-0.7.50-libmms.patch
===================================================================
--- libmediainfo-0.7.50-libmms.patch	2017-11-02 18:37:44 UTC (rev 265210)
+++ libmediainfo-0.7.50-libmms.patch	2017-11-02 19:28:36 UTC (rev 265211)
@@ -1,50 +0,0 @@
-diff -wbBur MediaInfoLib/Source/MediaInfo/Reader/Reader_libmms.cpp MediaInfoLib.my/Source/MediaInfo/Reader/Reader_libmms.cpp
---- MediaInfoLib/Source/MediaInfo/Reader/Reader_libmms.cpp	2011-08-25 15:14:50.000000000 +0400
-+++ MediaInfoLib.my/Source/MediaInfo/Reader/Reader_libmms.cpp	2011-10-05 17:29:12.000000000 +0400
-@@ -48,10 +48,8 @@
- #else
-     #ifdef MEDIAINFO_LIBMMS_FROMSOURCE
-         #include "mmsx.h"
--        #include "mmsh.h"
-     #else //MEDIAINFO_LIBMMS_FROMSOURCE
-         #include "libmms/mmsx.h"
--        #include "libmms/mmsh.h"
-     #endif //MEDIAINFO_LIBMMS_FROMSOURCE
- #endif
- #include <iostream>
-@@ -71,34 +69,9 @@
- //---------------------------------------------------------------------------
- size_t Reader_libmms::Format_Test(MediaInfo_Internal* MI, const String &File_Name)
- {
--    mmsx_t* Handle;
--
--    //Opening the file
--    #if MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT
--    if (MI->Config.File_Mmsh_Describe_Only_Get())
--    {
--        // Use MMSH & Send a DESCRIBE request
--        mmsh_t* MmshHandle;
--
--        MmshHandle=mmsh_describe_request(0, 0, Ztring(File_Name).To_Local().c_str());
--        if (MmshHandle==NULL)
--            return 0;
--
--        Handle=mmsx_set_mmsh_handle(MmshHandle);
--        if (Handle==NULL)
--        {
--            mmsh_close(MmshHandle);
--            return 0;
--        }
--    }
--    else
--    #endif //MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT
--    {
--       // Use MMS or MMSH (Send a DESCRIBE & PLAY request)
--       Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1);
-+    mmsx_t* Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1);
-        if (Handle==NULL)
-            return 0;
--    }
- 
-     //Init
-     size_t Buffer_Size_Max;