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

[Antonio Rojas]

    Date: Saturday, December 19, 2020 @ 12:25:15
  Author: arojas
Revision: 404633

Update to 3.5.28

Modified:
  djvulibre/trunk/PKGBUILD
Deleted:
  djvulibre/trunk/0001-always-assume-that-cpuid-works-on-x86_64.patch

-----------------------------------------------------+
 0001-always-assume-that-cpuid-works-on-x86_64.patch |   36 ------------------
 PKGBUILD                                            |   15 ++-----
 2 files changed, 4 insertions(+), 47 deletions(-)

Deleted: 0001-always-assume-that-cpuid-works-on-x86_64.patch
===================================================================
--- 0001-always-assume-that-cpuid-works-on-x86_64.patch	2020-12-19 12:09:31 UTC (rev 404632)
+++ 0001-always-assume-that-cpuid-works-on-x86_64.patch	2020-12-19 12:25:15 UTC (rev 404633)
@@ -1,36 +0,0 @@
-From 8407dd3421f720ab2e1a61e3f1e60e08967f98db Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon at bottou.org>
-Date: Sun, 7 Oct 2018 18:04:48 -0400
-Subject: [PATCH] always assume that cpuid works on x86_64
-
----
- libdjvu/MMX.cpp | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
-index e70fdd8..c0d1a34 100644
---- a/libdjvu/MMX.cpp
-+++ b/libdjvu/MMX.cpp
-@@ -169,16 +169,10 @@ MMXControl::enable_mmx()
- #endif
- #if defined(MMX) && defined(__GNUC__) && defined(__x86_64__)
-   // Detection of MMX for GCC
--  __asm__ volatile (// Check that CR0:EM is clear
--                    "xorl %%edx,%%edx\n\t"
--                    "smsw %%ax\n\t"
--                    "andl $4,%%eax\n\t"
--                    "jnz 1f\n\t"
--                    // Execute CPUID
-+  __asm__ volatile (// Execute CPUID
-                     "movl $1,%%eax\n\t"
--                    "cpuid\n"
--                    // Finish
--		    "1:\tmovl %%edx, %0"
-+                    "cpuid\n\t"
-+		    "movl %%edx, %0"
-                     : "=m" (cpuflags) :
-                     : "eax","ebx","ecx","edx");
- #endif
--- 
-2.24.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-19 12:09:31 UTC (rev 404632)
+++ PKGBUILD	2020-12-19 12:25:15 UTC (rev 404633)
@@ -3,8 +3,8 @@
 # Contributor: mgushee
 
 pkgname=djvulibre
-pkgver=3.5.27
-pkgrel=6
+pkgver=3.5.28
+pkgrel=1
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
 url='http://djvu.sourceforge.net/'
 arch=('x86_64')
@@ -11,20 +11,13 @@
 license=('GPL2')
 makedepends=('librsvg')
 depends=('libtiff' 'hicolor-icon-theme')
-source=("https://downloads.sourceforge.net/project/djvu/DjVuLibre/${pkgver}/djvulibre-${pkgver}.tar.gz"
-        '0001-always-assume-that-cpuid-works-on-x86_64.patch')
-sha256sums=('e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f'
-            '35654b433a7bbf0bf7e039385a80034776d5134bc59ff82ef74170ef4bbc86ce')
+source=("https://downloads.sourceforge.net/project/djvu/DjVuLibre/${pkgver//./,}/djvulibre-${pkgver}.tar.gz")
+sha256sums=('82e392a9cccfee94fa604126c67f06dbc43ed5f9f0905d15b6c8164f83ed5655')
 
 conflicts=('libdjvu')
 provides=("libdjvu=${pkgver}")
 replaces=('libdjvu')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../0001-always-assume-that-cpuid-works-on-x86_64.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./autogen.sh