[arch-commits] Commit in lib32-libvpx1.3/repos/multilib-x86_64 (5 files)
Maxime Gauduin
alucryd at gemini.archlinux.org
Thu Aug 11 13:43:09 UTC 2022
Date: Thursday, August 11, 2022 @ 13:43:09
Author: alucryd
Revision: 1265237
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libvpx1.3/repos/multilib-x86_64/PKGBUILD
(from rev 1265236, lib32-libvpx1.3/trunk/PKGBUILD)
lib32-libvpx1.3/repos/multilib-x86_64/libvpx-1.3-gcc-5.2.patch
(from rev 1265236, lib32-libvpx1.3/trunk/libvpx-1.3-gcc-5.2.patch)
lib32-libvpx1.3/repos/multilib-x86_64/libvpx-1.3-not-x32.patch
(from rev 1265236, lib32-libvpx1.3/trunk/libvpx-1.3-not-x32.patch)
Deleted:
lib32-libvpx1.3/repos/multilib-x86_64/PKGBUILD
lib32-libvpx1.3/repos/multilib-x86_64/libvpx-1.3-gcc-5.2.patch
--------------------------+
PKGBUILD | 121 +++++++++++++++++++++++----------------------
libvpx-1.3-gcc-5.2.patch | 48 ++++++++---------
libvpx-1.3-not-x32.patch | 13 ++++
3 files changed, 100 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-11 13:42:57 UTC (rev 1265236)
+++ PKGBUILD 2022-08-11 13:43:09 UTC (rev 1265237)
@@ -1,58 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Dan Ziemba <zman0900 at gmail.com>
-
-pkgname=lib32-libvpx1.3
-pkgver=1.3.0
-pkgrel=2
-pkgdesc='VP8 and VP9 codec'
-arch=('x86_64')
-url='http://www.webmproject.org/'
-license=('BSD')
-depends=('lib32-glibc')
-makedepends=('yasm' 'git')
-provides=('libvpx.so')
-source=("libvpx-${pkgver}.tar.gz::https://github.com/webmproject/libvpx/archive/v${pkgver}.tar.gz"
- 'libvpx-1.3-gcc-5.2.patch')
-sha256sums=('db72881e1c34e4ae92666847844f35dd2dd431bcf6284500b1b396464f882f64'
- 'df157b8f0e4469692598f5f12b305561a56a84374880ef740ccb8f0b447851e1')
-
-prepare() {
- cd libvpx-${pkgver}
-
- patch -Np1 -i ../libvpx-1.3-gcc-5.2.patch
-}
-
-build() {
- cd libvpx-${pkgver}
-
- export CC='gcc -m32'
- export PKG_CONFIG_PATH='/usr/lib/pkgconfig'
-
- ./configure \
- --prefix='/usr' \
- --libdir='/usr/lib32' \
- --target='x86-linux-gcc' \
- --enable-runtime-cpu-detect \
- --enable-shared \
- --enable-pic \
- --disable-install-docs \
- --disable-install-srcs \
- --enable-vp8 \
- --enable-postproc \
- --enable-vp9
-
- make
-}
-
-package() {
- cd libvpx-${pkgver}
-
- make DIST_DIR="${pkgdir}"/usr install
- rm -rf "${pkgdir}"/usr/{bin,include,lib32/{libvpx.{a,so},pkgconfig},share}
-
- install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/lib32-libvpx1.3/
-}
-
-# vim: ts=2 sw=2 et:
Copied: lib32-libvpx1.3/repos/multilib-x86_64/PKGBUILD (from rev 1265236, lib32-libvpx1.3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-11 13:43:09 UTC (rev 1265237)
@@ -0,0 +1,63 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Dan Ziemba <zman0900 at gmail.com>
+
+pkgname=lib32-libvpx1.3
+pkgver=1.3.0
+pkgrel=3
+pkgdesc='VP8 and VP9 codec'
+arch=(x86_64)
+url=https://www.webmproject.org/
+license=(BSD)
+depends=(lib32-glibc)
+makedepends=(
+ git
+ nasm
+)
+provides=(libvpx.so)
+source=(
+ libvpx-${pkgver}.tar.gz::https://github.com/webmproject/libvpx/archive/v${pkgver}.tar.gz
+ libvpx-1.3-gcc-5.2.patch
+ libvpx-1.3-not-x32.patch
+)
+b2sums=('7563f8b760287af3b7feab0c0a4001cb5e1451eb56b1f9b163eb38fd62c0aeb27760c0c009237cdfd1c7f73f438fe642d080b4bf9d797a0cf14ba199d035c411'
+ '3940c09dfb7bd851ac051bc5b4d14bac51b1572a3ef1a3c923e34f42b1c1f75d2c2cab3b7f2aca161c9356665331b1e80be7a5af84bb19f959f069c16f4878d7'
+ 'ec8fcb395a2ca161114cc55ccac2d1d5a021a92389e5ae337cd44520d5803b2af8d0e8dd39e148dfea42e77ba83ca1cbdfda81ddf29d39c2e549e2670558ae85')
+
+prepare() {
+ cd libvpx-${pkgver}
+ patch -Np1 -i ../libvpx-1.3-gcc-5.2.patch
+ patch -Np1 -i ../libvpx-1.3-not-x32.patch
+}
+
+build() {
+ cd libvpx-${pkgver}
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export CFLAGS+=' -ffat-lto-objects'
+ export CXXFLAGS+=' -ffat-lto-objects'
+ export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
+ ./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib32 \
+ --target=x86-linux-gcc \
+ --enable-runtime-cpu-detect \
+ --enable-shared \
+ --enable-pic \
+ --disable-install-docs \
+ --disable-install-srcs \
+ --enable-vp8 \
+ --enable-postproc \
+ --enable-vp9
+ make
+}
+
+package() {
+ cd libvpx-${pkgver}
+ make DIST_DIR="${pkgdir}"/usr install
+ rm -rf "${pkgdir}"/usr/{bin,include,lib32/{libvpx.{a,so},pkgconfig},share}
+ install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/lib32-libvpx1.3/
+}
+
+# vim: ts=2 sw=2 et:
Deleted: libvpx-1.3-gcc-5.2.patch
===================================================================
--- libvpx-1.3-gcc-5.2.patch 2022-08-11 13:42:57 UTC (rev 1265236)
+++ libvpx-1.3-gcc-5.2.patch 2022-08-11 13:43:09 UTC (rev 1265237)
@@ -1,24 +0,0 @@
-diff -Naur libvpx-1.3.orig/nestegg/halloc/src/align.h libvpx-1.3/nestegg/halloc/src/align.h
---- libvpx-1.3.orig/nestegg/halloc/src/align.h 2015-08-02 13:42:14.783914000 +0200
-+++ libvpx-1.3/nestegg/halloc/src/align.h 2015-08-02 13:43:04.100580874 +0200
-@@ -30,7 +30,7 @@
- void (*q)(void);
- };
-
--typedef union max_align max_align_t;
-+typedef union max_align h_max_align_t;
-
- #endif
-
-diff -Naur libvpx-1.3.orig/nestegg/halloc/src/halloc.c libvpx-1.3/nestegg/halloc/src/halloc.c
---- libvpx-1.3.orig/nestegg/halloc/src/halloc.c 2015-08-02 13:42:14.783914000 +0200
-+++ libvpx-1.3/nestegg/halloc/src/halloc.c 2015-08-02 13:43:35.817247310 +0200
-@@ -30,7 +30,7 @@
- #endif
- hlist_item_t siblings; /* 2 pointers */
- hlist_head_t children; /* 1 pointer */
-- max_align_t data[1]; /* not allocated, see below */
-+ h_max_align_t data[1]; /* not allocated, see below */
-
- } hblock_t;
-
Copied: lib32-libvpx1.3/repos/multilib-x86_64/libvpx-1.3-gcc-5.2.patch (from rev 1265236, lib32-libvpx1.3/trunk/libvpx-1.3-gcc-5.2.patch)
===================================================================
--- libvpx-1.3-gcc-5.2.patch (rev 0)
+++ libvpx-1.3-gcc-5.2.patch 2022-08-11 13:43:09 UTC (rev 1265237)
@@ -0,0 +1,24 @@
+diff -Naur libvpx-1.3.orig/nestegg/halloc/src/align.h libvpx-1.3/nestegg/halloc/src/align.h
+--- libvpx-1.3.orig/nestegg/halloc/src/align.h 2015-08-02 13:42:14.783914000 +0200
++++ libvpx-1.3/nestegg/halloc/src/align.h 2015-08-02 13:43:04.100580874 +0200
+@@ -30,7 +30,7 @@
+ void (*q)(void);
+ };
+
+-typedef union max_align max_align_t;
++typedef union max_align h_max_align_t;
+
+ #endif
+
+diff -Naur libvpx-1.3.orig/nestegg/halloc/src/halloc.c libvpx-1.3/nestegg/halloc/src/halloc.c
+--- libvpx-1.3.orig/nestegg/halloc/src/halloc.c 2015-08-02 13:42:14.783914000 +0200
++++ libvpx-1.3/nestegg/halloc/src/halloc.c 2015-08-02 13:43:35.817247310 +0200
+@@ -30,7 +30,7 @@
+ #endif
+ hlist_item_t siblings; /* 2 pointers */
+ hlist_head_t children; /* 1 pointer */
+- max_align_t data[1]; /* not allocated, see below */
++ h_max_align_t data[1]; /* not allocated, see below */
+
+ } hblock_t;
+
Copied: lib32-libvpx1.3/repos/multilib-x86_64/libvpx-1.3-not-x32.patch (from rev 1265236, lib32-libvpx1.3/trunk/libvpx-1.3-not-x32.patch)
===================================================================
--- libvpx-1.3-not-x32.patch (rev 0)
+++ libvpx-1.3-not-x32.patch 2022-08-11 13:43:09 UTC (rev 1265237)
@@ -0,0 +1,13 @@
+diff '--color=auto' -rupN libvpx-1.3.0.orig/build/make/configure.sh libvpx-1.3.0/build/make/configure.sh
+--- libvpx-1.3.0.orig/build/make/configure.sh 2022-08-11 15:36:47.036147259 +0200
++++ libvpx-1.3.0/build/make/configure.sh 2022-08-11 15:37:09.294922277 +0200
+@@ -1019,7 +1019,7 @@ EOF
+ bits=32
+ enabled x86_64 && bits=64
+ check_cpp <<EOF && bits=x32
+-#ifndef __ILP32__
++#if !defined(__ILP32__) || !defined(__x86_64__)
+ #error "not x32"
+ #endif
+ EOF
+
More information about the arch-commits
mailing list