From 3c36f8f2509cfe8761dbb252fe1c26e94fc48568959d49e32a533de8e0ddb6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Wed, 14 Apr 2021 06:17:16 +0000
Subject: [PATCH] go back to obscpio

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvpx?expand=0&rev=115
---
 _service                       | 16 ++++++++++++++++
 libvpx-1.10.0.obscpio          |  3 +++
 libvpx-define-config_pic.patch |  2 ++
 libvpx.changes                 |  6 ++++++
 libvpx.obsinfo                 |  5 +++++
 libvpx.spec                    |  4 ++--
 v1.10.0.tar.gz                 |  3 ---
 7 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 _service
 create mode 100644 libvpx-1.10.0.obscpio
 create mode 100644 libvpx.obsinfo
 delete mode 100644 v1.10.0.tar.gz

diff --git a/_service b/_service
new file mode 100644
index 0000000..c56d97d
--- /dev/null
+++ b/_service
@@ -0,0 +1,16 @@
+<services>
+  <service name="obs_scm" mode="manual">
+    <param name="url">https://github.com/webmproject/libvpx.git</param>
+    <param name="scm">git</param>
+    <param name="version">1.10.0</param>
+    <param name="revision">v1.10.0</param>
+  </service>
+  <service mode="manual" name="set_version" />
+
+  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+</services>
+
diff --git a/libvpx-1.10.0.obscpio b/libvpx-1.10.0.obscpio
new file mode 100644
index 0000000..19b9847
--- /dev/null
+++ b/libvpx-1.10.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69d11c9a1ec389e94e8b5cf0917666a595493fd8b0c4743ba0854f249cce1114
+size 22516237
diff --git a/libvpx-define-config_pic.patch b/libvpx-define-config_pic.patch
index e367cd1..fd993eb 100644
--- a/libvpx-define-config_pic.patch
+++ b/libvpx-define-config_pic.patch
@@ -1,3 +1,5 @@
+diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm
+index 6b2d6b968..6cb439c9c 100644
 --- a/vpx_ports/x86_abi_support.asm
 +++ b/vpx_ports/x86_abi_support.asm
 @@ -10,6 +10,7 @@
diff --git a/libvpx.changes b/libvpx.changes
index 9c4e2c5..bf8d9f7 100644
--- a/libvpx.changes
+++ b/libvpx.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 14 06:00:00 UTC 2021 - Adrian Schröter <adrian@suse.de>
+
+- using service/obspcio again because upstream tar ball is changing,
+  leading to trust validation errors
+
 -------------------------------------------------------------------
 Tue Mar 30 22:20:30 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/libvpx.obsinfo b/libvpx.obsinfo
new file mode 100644
index 0000000..df17643
--- /dev/null
+++ b/libvpx.obsinfo
@@ -0,0 +1,5 @@
+name: libvpx
+version: 1.10.0
+mtime: 1616097586
+commit: b41ffb53f1000ab2227c1736d8c1355aa5081c40
+
diff --git a/libvpx.spec b/libvpx.spec
index e3b139b..2371ec1 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -24,7 +24,7 @@ Summary:        VP8/VP9 codec library
 License:        BSD-3-Clause AND GPL-2.0-or-later
 Group:          Productivity/Multimedia/Other
 URL:            https://www.webmproject.org/
-Source0:        https://chromium.googlesource.com/webm/libvpx/+archive/v%{version}.tar.gz
+Source0:        %name-%version.tar.xz
 Source1000:     baselibs.conf
 Patch1:         libvpx-define-config_pic.patch
 Patch2:         libvpx-configure-add-s390.patch
@@ -91,7 +91,7 @@ and audio streams compressed with the Vorbis audio codec.
 The WebM file structure is based on the Matroska container.
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q
 %patch1 -p1
 %patch2 -p1
 %patch4 -p1
diff --git a/v1.10.0.tar.gz b/v1.10.0.tar.gz
deleted file mode 100644
index f25023e..0000000
--- a/v1.10.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae2ffb610f4ae34a73e9ba966788c3eea1f810c357f4e8b1ebd9e636cf60fd80
-size 5331468