Date: Friday, December 6, 2019 @ 00:06:02 Author: bisson Revision: 370450
archrelease: copy trunk to extra-x86_64 Added: djvulibre/repos/extra-x86_64/0001-always-assume-that-cpuid-works-on-x86_64.patch (from rev 370449, djvulibre/trunk/0001-always-assume-that-cpuid-works-on-x86_64.patch) djvulibre/repos/extra-x86_64/PKGBUILD (from rev 370449, djvulibre/trunk/PKGBUILD) Deleted: djvulibre/repos/extra-x86_64/PKGBUILD -----------------------------------------------------+ 0001-always-assume-that-cpuid-works-on-x86_64.patch | 36 ++++++++ PKGBUILD | 75 +++++++++--------- 2 files changed, 77 insertions(+), 34 deletions(-) Copied: djvulibre/repos/extra-x86_64/0001-always-assume-that-cpuid-works-on-x86_64.patch (from rev 370449, djvulibre/trunk/0001-always-assume-that-cpuid-works-on-x86_64.patch) =================================================================== --- 0001-always-assume-that-cpuid-works-on-x86_64.patch (rev 0) +++ 0001-always-assume-that-cpuid-works-on-x86_64.patch 2019-12-06 00:06:02 UTC (rev 370450) @@ -0,0 +1,36 @@ +From 8407dd3421f720ab2e1a61e3f1e60e08967f98db Mon Sep 17 00:00:00 2001 +From: Leon Bottou <l...@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 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-12-06 00:05:40 UTC (rev 370449) +++ PKGBUILD 2019-12-06 00:06:02 UTC (rev 370450) @@ -1,34 +0,0 @@ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: mgushee - -pkgname=djvulibre -pkgver=3.5.27 -pkgrel=4 -pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents" -url='http://djvu.sourceforge.net/' -arch=('x86_64') -license=('GPL2') -makedepends=('librsvg') -depends=('libtiff' 'hicolor-icon-theme') -source=("https://downloads.sourceforge.net/project/djvu/DjVuLibre/${pkgver}/djvulibre-${pkgver}.tar.gz") -sha256sums=('e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f') - -conflicts=('libdjvu') -provides=("libdjvu=${pkgver}") -replaces=('libdjvu') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh - ./configure --prefix=/usr --disable-desktopfiles - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - for sz in 22 32 48 64; do - install -Dm644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png" - done -} Copied: djvulibre/repos/extra-x86_64/PKGBUILD (from rev 370449, djvulibre/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-06 00:06:02 UTC (rev 370450) @@ -0,0 +1,41 @@ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: mgushee + +pkgname=djvulibre +pkgver=3.5.27 +pkgrel=5 +pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents" +url='http://djvu.sourceforge.net/' +arch=('x86_64') +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') + +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 + ./configure --prefix=/usr --disable-desktopfiles + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + for sz in 22 32 48 64; do + install -Dm644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png" + done +}