bump

3 files changed, 4 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 706ac1131710..89400c0bb16b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cin-git
 	pkgdesc = Cinelerra maintained by Good Guy (git version)
-	pkgver = 5.1.20190430
+	pkgver = 5.1.20200131
 	pkgrel = 1
 	url = https://www.cinelerra-gg.org
 	arch = x86_64
@@ -52,9 +52,7 @@ pkgbase = cin-git
 	depends = xorg-server
 	depends = xorg-fonts-misc
 	source = cinelerra-gg::git+git://git.cinelerra-gg.org/goodguy/cinelerra.git
-	source = dep.patch
 	sha256sums = SKIP
-	sha256sums = ef8e25d0bee3b495c4dda3add81090731932d35ab60eca4f744a2e885ad1ce37
 
 pkgname = cin-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9b33c4ec0296..170153ebd22e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ _pkgname=cinelerra-gg
 _pkgver=5.1
 
 pkgname=cin-git
-pkgver=5.1.20190430
+pkgver=5.1.20200131
 pkgrel=1
 pkgdesc="Cinelerra maintained by Good Guy (git version)"
 arch=('x86_64')
@@ -61,10 +61,8 @@ makedepends=('yasm'
              'libxml2'
              'perl-xml-libxml'
              'perl-xml-parser')
-source=("${_pkgname}::git+git://git.cinelerra-gg.org/goodguy/cinelerra.git"
-        "dep.patch")
-sha256sums=('SKIP'
-            'ef8e25d0bee3b495c4dda3add81090731932d35ab60eca4f744a2e885ad1ce37')
+source=("${_pkgname}::git+git://git.cinelerra-gg.org/goodguy/cinelerra.git")
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}/cinelerra-${_pkgver}/blds"
@@ -72,13 +70,6 @@ pkgver() {
 }
 
 prepare() {
-  cd "${srcdir}"
-  # Patches
-  # 1. do not build libvorbis when libvorbis is installed
-  # 2. fix wrong openexr detection
-  # 3. fix wrong pkg-config definition
-  patch -Np0 -i dep.patch
-
   cd "${srcdir}/${_pkgname}/cinelerra-${_pkgver}"
   sed -i 's/\<python\>/python2.7/' ./guicast/Makefile
   ./autogen.sh
diff --git a/dep.patch b/dep.patch
deleted file mode 100644
index 385f2aa27880..000000000000
--- a/dep.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN cinelerra-gg/cinelerra-5.1/configure.ac cinelerra-gg-new/cinelerra-5.1/configure.ac
---- cinelerra-gg/cinelerra-5.1/configure.ac	2018-11-02 16:41:41.523009718 +0800
-+++ cinelerra-gg-new/cinelerra-5.1/configure.ac	2018-11-02 16:42:45.643716648 +0800
-@@ -669,8 +669,8 @@
- EXRIStream() : Imf::IStream("mypath") {} };
- class EXROStream : public Imf::OStream { public: 
- EXROStream() : Imf::OStream("mypath") {} };
--]])], [HAVE_OPENEXR=yes], [HAVE_OPENEXR=no])
-- RESULT="$HAVE_OPENEXR"
-+]])], [HAVE_openexr=yes], [HAVE_openexr=no])
-+ RESULT="$HAVE_openexr"
-  if test "x$RESULT" = "xyes"; then
-    SHARED_openexr="$LIBS"
-    CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
-@@ -678,9 +678,9 @@
-  LIBS="$saved_LIBS"
-  CXXFLAGS="$saved_CXXFLAGS"
-  AC_LANG_POP(C++)
-- AC_MSG_RESULT([$HAVE_OPENEXR])
-+ AC_MSG_RESULT([$HAVE_openexr])
- ])
--AC_SUBST([HAVE_OPENEXR])
-+AC_SUBST([HAVE_openexr])
- 
- # build global_config
- OBJDIR=`uname -m`
-@@ -724,7 +724,7 @@
-         libtheora/libogg libtheora/libvorbis ; do
-   lib=`dirname $dep`;  needs=`basename $dep`
-   eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs";
--  if test "x$pkg_lib" != "xno"; then
-+  if test "x$pkg_lib" != "xno" -a "x$needs_lib" != "xyes"; then
-     eval "PKG_$needs=yes"
-   fi
- done