forked from pool/libquicktime
This commit is contained in:
parent
e93eddf4dc
commit
a051ce6a16
@ -1,24 +0,0 @@
|
|||||||
From a6739e3baa2c1da8446b6cc507125e3bfd191ff8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
|
|
||||||
Date: Wed, 13 Jun 2018 11:28:42 +0200
|
|
||||||
Subject: [PATCH 4/5] Ignore prepared patches in git checkout
|
|
||||||
|
|
||||||
---
|
|
||||||
.gitignore | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/.gitignore b/.gitignore
|
|
||||||
index c87cbe6..10d7cfd 100644
|
|
||||||
--- a/.gitignore
|
|
||||||
+++ b/.gitignore
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
*.in
|
|
||||||
*.lo
|
|
||||||
*.la
|
|
||||||
+*.patch
|
|
||||||
.deps
|
|
||||||
.libs
|
|
||||||
*~
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
@ -24,7 +24,6 @@ Wed Jun 13 09:01:47 UTC 2018 - tchvatal@suse.com
|
|||||||
* 0001-Fix-sizeof-call-in-faad2.patch
|
* 0001-Fix-sizeof-call-in-faad2.patch
|
||||||
* 0002-Allow-any-avcodec-to-be-detected-by-configure.patch
|
* 0002-Allow-any-avcodec-to-be-detected-by-configure.patch
|
||||||
* 0003-Fix-AVCODEC_HEADER-macro-replacement.patch
|
* 0003-Fix-AVCODEC_HEADER-macro-replacement.patch
|
||||||
* 0004-Ignore-prepared-patches-in-git-checkout.patch
|
|
||||||
* 0005-ffmpeg4-conversion-fixing-the-erroring-ones-only.patch
|
* 0005-ffmpeg4-conversion-fixing-the-erroring-ones-only.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
|
@ -32,7 +32,6 @@ Source2: baselibs.conf
|
|||||||
Patch1: 0001-Fix-sizeof-call-in-faad2.patch
|
Patch1: 0001-Fix-sizeof-call-in-faad2.patch
|
||||||
Patch2: 0002-Allow-any-avcodec-to-be-detected-by-configure.patch
|
Patch2: 0002-Allow-any-avcodec-to-be-detected-by-configure.patch
|
||||||
Patch3: 0003-Fix-AVCODEC_HEADER-macro-replacement.patch
|
Patch3: 0003-Fix-AVCODEC_HEADER-macro-replacement.patch
|
||||||
#Patch4: 0004-Ignore-prepared-patches-in-git-checkout.patch
|
|
||||||
Patch5: 0005-ffmpeg4-conversion-fixing-the-erroring-ones-only.patch
|
Patch5: 0005-ffmpeg4-conversion-fixing-the-erroring-ones-only.patch
|
||||||
BuildRequires: alsa-devel
|
BuildRequires: alsa-devel
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
|
Loading…
Reference in New Issue
Block a user