[arch-commits] Commit in (cinelerra-cv)

[David Runge via arch-commits]

Date: Saturday, December 29, 2018 @ 22:05:07
  Author: dvzrv
Revision: 418940

Moving cinelerra-cv to the AUR, after announcing it upstream and getting into 
contact with cinelerra-gg as a potential replacement (in the future).

Deleted:
  cinelerra-cv/

[arch-commits] Commit in cinelerra-cv/repos (9 files)

[Antonio Rojas via arch-commits]

Date: Tuesday, August 21, 2018 @ 13:11:34
  Author: arojas
Revision: 373134

archrelease: copy trunk to community-staging-x86_64

Added:
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 373133, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch
(from rev 373133, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg4.patch
(from rev 373133, cinelerra-cv/trunk/cinelerra-cv-ffmpeg4.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg-link.patch
(from rev 373133, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 373133, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 373133, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 373133, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 373133, cinelerra-cv/trunk/v4l1_removal.patch)

+
 PKGBUILD   |   83 +
 cinelerra-cv-ffmpeg3.patch |  681 +++
 cinelerra-cv-ffmpeg4.patch |   82 +
 ffmpeg-link.patch  |   24 +
 ffmpeg2.0.patch|   98 ++
 ffmpeg_api.patch   |  163 ++
 gcc5fix.patch  |   33 ++
 v4l1_removal.patch |  125 +++
 8 files changed, 1289 insertions(+)

Copied: cinelerra-cv/repos/community-staging-x86_64/PKGBUILD (from rev 373133, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-08-21 13:11:34 UTC (rev 373134)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Ray Rashif 
+# Contributor: Daniel J Griffiths 
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Alexander Rødseth 
+
+_name=CinelerraCV
+pkgname=cinelerra-cv
+pkgver=2.3
+pkgrel=6
+epoch=1
+pkgdesc="Professional video editing and compositing environment"
+arch=('x86_64')
+url="https://cinelerra-cv.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
+makedepends=('git' 'nasm' 'mesa')
+source=("https://${pkgname}.org/releases/${_name}-${pkgver}.tar.xz;
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'gcc5fix.patch'
+'cinelerra-cv-ffmpeg3.patch'
+'ffmpeg-link.patch'
+'cinelerra-cv-ffmpeg4.patch')
+sha512sums=('908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e'
+
'0295d71dd4b17051288778f54c57babd4fbfab5be29b71c47caf2bbac614898a7c2c7cb6cb1d093e6237f929f4e765a2fbed363cc34a3481d628ccdda19fe83e'
+
'0882e87b3d8bd99de6c08d61a2569dd4595a90066ee6f697fddedb9f863f4ba3bcfb2b986e7ffeef369151cebf326a128f322d86c3c84602f7b35252f91a9bdb'
+
'5313820d0030c216710654cb4ba17d33478e7f1d644c668d64e74c0d580d04ba658e68302a85311b2d2792c05a943a546b620ec680847d0324d335b168ba69c7'
+
'b81bc1c5794003486f0ca1f8e5172ed4b0d1b06d2b3c00d5fc665a00b921e128d83e321fd0c41f9508f9f3726908b1f3876b45d4ecc4a32e7ec5e95ede564495'
+
'e7f7c4058e4ea5cd21ed9abcb8383828aef181474b373051a23cbf31e6a68ba728c392fda93c301fd299facfe13e398ad1ccb990fc9ab3a3e4f4fd6238fea905'
+
'bc3729d9a61b9734356162acdcf3c055b2a3fdb162686db9267da97a7e8b28f39637abd8524a6b2e286fbe99bd89d45e1df857048125286fbe6262e470ba6124'
+
'39af2d3b1e1ce0faaef63db23bebc5466b7ac15a75da58c7119f443ec6c4b06ec9118cea21fa2d5ff98031b7399f24e0a5d2280ebd01dea534377f685e0492de')
+
+prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+
+  ## Patches (oldest first) ##
+  # v4l1 removal patch
+  patch -Np1 -i "$srcdir/v4l1_removal.patch"
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i "$srcdir/ffmpeg_api.patch"
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
+  # gcc 5.x fix
+  patch -Np1 -i "$srcdir/gcc5fix.patch"
+  # fix build with ffmpeg 3.0
+  patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
+  patch -p0 -i ../ffmpeg-link.patch
+  # fix build with ffmpeg 4.0 (Gentoo)
+  patch -p1 -i ../cinelerra-cv-ffmpeg4.patch
+  # gcc 4.6 workaround
+  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
+  export CPPFLAGS="$CFLAGS"
+  # remove executable stack
+  export LDFLAGS+=" -Wl,-z,noexecstack"
+  autoreconf -vfi
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  # disable mmx due to improper use of registers in asm
+  # - possibly a new problem since gcc 4.9
+  ./configure --prefix=/usr \
+  

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Tuesday, August 21, 2018 @ 13:10:58
  Author: arojas
Revision: 373133

ilmbase/openexr 2.3 rebuild

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-21 13:03:41 UTC (rev 373132)
+++ PKGBUILD2018-08-21 13:10:58 UTC (rev 373133)
@@ -7,7 +7,7 @@
 _name=CinelerraCV
 pkgname=cinelerra-cv
 pkgver=2.3
-pkgrel=5
+pkgrel=6
 epoch=1
 pkgdesc="Professional video editing and compositing environment"
 arch=('x86_64')

[arch-commits] Commit in cinelerra-cv/repos (9 files)

[Maxime Gauduin via arch-commits]

Date: Tuesday, August 7, 2018 @ 11:33:27
  Author: alucryd
Revision: 370119

archrelease: copy trunk to community-staging-x86_64

Added:
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 370118, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch
(from rev 370118, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg4.patch
(from rev 370118, cinelerra-cv/trunk/cinelerra-cv-ffmpeg4.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg-link.patch
(from rev 370118, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 370118, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 370118, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 370118, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 370118, cinelerra-cv/trunk/v4l1_removal.patch)

+
 PKGBUILD   |   83 +
 cinelerra-cv-ffmpeg3.patch |  681 +++
 cinelerra-cv-ffmpeg4.patch |   82 +
 ffmpeg-link.patch  |   24 +
 ffmpeg2.0.patch|   98 ++
 ffmpeg_api.patch   |  163 ++
 gcc5fix.patch  |   33 ++
 v4l1_removal.patch |  125 +++
 8 files changed, 1289 insertions(+)

Copied: cinelerra-cv/repos/community-staging-x86_64/PKGBUILD (from rev 370118, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-08-07 11:33:27 UTC (rev 370119)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Ray Rashif 
+# Contributor: Daniel J Griffiths 
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Alexander Rødseth 
+
+_name=CinelerraCV
+pkgname=cinelerra-cv
+pkgver=2.3
+pkgrel=5
+epoch=1
+pkgdesc="Professional video editing and compositing environment"
+arch=('x86_64')
+url="https://cinelerra-cv.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
+makedepends=('git' 'nasm' 'mesa')
+source=("https://${pkgname}.org/releases/${_name}-${pkgver}.tar.xz;
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'gcc5fix.patch'
+'cinelerra-cv-ffmpeg3.patch'
+'ffmpeg-link.patch'
+'cinelerra-cv-ffmpeg4.patch')
+sha512sums=('908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e'
+
'0295d71dd4b17051288778f54c57babd4fbfab5be29b71c47caf2bbac614898a7c2c7cb6cb1d093e6237f929f4e765a2fbed363cc34a3481d628ccdda19fe83e'
+
'0882e87b3d8bd99de6c08d61a2569dd4595a90066ee6f697fddedb9f863f4ba3bcfb2b986e7ffeef369151cebf326a128f322d86c3c84602f7b35252f91a9bdb'
+
'5313820d0030c216710654cb4ba17d33478e7f1d644c668d64e74c0d580d04ba658e68302a85311b2d2792c05a943a546b620ec680847d0324d335b168ba69c7'
+
'b81bc1c5794003486f0ca1f8e5172ed4b0d1b06d2b3c00d5fc665a00b921e128d83e321fd0c41f9508f9f3726908b1f3876b45d4ecc4a32e7ec5e95ede564495'
+
'e7f7c4058e4ea5cd21ed9abcb8383828aef181474b373051a23cbf31e6a68ba728c392fda93c301fd299facfe13e398ad1ccb990fc9ab3a3e4f4fd6238fea905'
+
'bc3729d9a61b9734356162acdcf3c055b2a3fdb162686db9267da97a7e8b28f39637abd8524a6b2e286fbe99bd89d45e1df857048125286fbe6262e470ba6124'
+
'39af2d3b1e1ce0faaef63db23bebc5466b7ac15a75da58c7119f443ec6c4b06ec9118cea21fa2d5ff98031b7399f24e0a5d2280ebd01dea534377f685e0492de')
+
+prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+
+  ## Patches (oldest first) ##
+  # v4l1 removal patch
+  patch -Np1 -i "$srcdir/v4l1_removal.patch"
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i "$srcdir/ffmpeg_api.patch"
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
+  # gcc 5.x fix
+  patch -Np1 -i "$srcdir/gcc5fix.patch"
+  # fix build with ffmpeg 3.0
+  patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
+  patch -p0 -i ../ffmpeg-link.patch
+  # fix build with ffmpeg 4.0 (Gentoo)
+  patch -p1 -i ../cinelerra-cv-ffmpeg4.patch
+  # gcc 4.6 workaround
+  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
+  export CPPFLAGS="$CFLAGS"
+  # remove executable stack
+  export LDFLAGS+=" -Wl,-z,noexecstack"
+  autoreconf -vfi
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  # disable mmx due to improper use of registers in asm
+  # - possibly a new problem since gcc 4.9
+  ./configure --prefix=/usr \
+  

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Maxime Gauduin via arch-commits]

Date: Tuesday, August 7, 2018 @ 11:33:14
  Author: alucryd
Revision: 370118

x264 155 rebuild: cinelerra-cv 1:2.3-5

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-07 11:18:59 UTC (rev 370117)
+++ PKGBUILD2018-08-07 11:33:14 UTC (rev 370118)
@@ -7,7 +7,7 @@
 _name=CinelerraCV
 pkgname=cinelerra-cv
 pkgver=2.3
-pkgrel=4
+pkgrel=5
 epoch=1
 pkgdesc="Professional video editing and compositing environment"
 arch=('x86_64')

[arch-commits] Commit in cinelerra-cv/repos (9 files)

[Antonio Rojas via arch-commits]

Date: Tuesday, May 1, 2018 @ 18:17:39
  Author: arojas
Revision: 318601

archrelease: copy trunk to community-staging-x86_64

Added:
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 318600, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch
(from rev 318600, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg4.patch
(from rev 318600, cinelerra-cv/trunk/cinelerra-cv-ffmpeg4.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg-link.patch
(from rev 318600, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 318600, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 318600, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 318600, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 318600, cinelerra-cv/trunk/v4l1_removal.patch)

+
 PKGBUILD   |   83 +
 cinelerra-cv-ffmpeg3.patch |  681 +++
 cinelerra-cv-ffmpeg4.patch |   82 +
 ffmpeg-link.patch  |   24 +
 ffmpeg2.0.patch|   98 ++
 ffmpeg_api.patch   |  163 ++
 gcc5fix.patch  |   33 ++
 v4l1_removal.patch |  125 +++
 8 files changed, 1289 insertions(+)

Copied: cinelerra-cv/repos/community-staging-x86_64/PKGBUILD (from rev 318600, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-05-01 18:17:39 UTC (rev 318601)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Ray Rashif 
+# Contributor: Daniel J Griffiths 
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Alexander Rødseth 
+
+_name=CinelerraCV
+pkgname=cinelerra-cv
+pkgver=2.3
+pkgrel=4
+epoch=1
+pkgdesc="Professional video editing and compositing environment"
+arch=('x86_64')
+url="https://cinelerra-cv.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
+makedepends=('git' 'nasm' 'mesa')
+source=("https://${pkgname}.org/releases/${_name}-${pkgver}.tar.xz;
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'gcc5fix.patch'
+'cinelerra-cv-ffmpeg3.patch'
+'ffmpeg-link.patch'
+'cinelerra-cv-ffmpeg4.patch')
+sha512sums=('908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e'
+
'0295d71dd4b17051288778f54c57babd4fbfab5be29b71c47caf2bbac614898a7c2c7cb6cb1d093e6237f929f4e765a2fbed363cc34a3481d628ccdda19fe83e'
+
'0882e87b3d8bd99de6c08d61a2569dd4595a90066ee6f697fddedb9f863f4ba3bcfb2b986e7ffeef369151cebf326a128f322d86c3c84602f7b35252f91a9bdb'
+
'5313820d0030c216710654cb4ba17d33478e7f1d644c668d64e74c0d580d04ba658e68302a85311b2d2792c05a943a546b620ec680847d0324d335b168ba69c7'
+
'b81bc1c5794003486f0ca1f8e5172ed4b0d1b06d2b3c00d5fc665a00b921e128d83e321fd0c41f9508f9f3726908b1f3876b45d4ecc4a32e7ec5e95ede564495'
+
'e7f7c4058e4ea5cd21ed9abcb8383828aef181474b373051a23cbf31e6a68ba728c392fda93c301fd299facfe13e398ad1ccb990fc9ab3a3e4f4fd6238fea905'
+
'bc3729d9a61b9734356162acdcf3c055b2a3fdb162686db9267da97a7e8b28f39637abd8524a6b2e286fbe99bd89d45e1df857048125286fbe6262e470ba6124'
+
'39af2d3b1e1ce0faaef63db23bebc5466b7ac15a75da58c7119f443ec6c4b06ec9118cea21fa2d5ff98031b7399f24e0a5d2280ebd01dea534377f685e0492de')
+
+prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+
+  ## Patches (oldest first) ##
+  # v4l1 removal patch
+  patch -Np1 -i "$srcdir/v4l1_removal.patch"
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i "$srcdir/ffmpeg_api.patch"
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
+  # gcc 5.x fix
+  patch -Np1 -i "$srcdir/gcc5fix.patch"
+  # fix build with ffmpeg 3.0
+  patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
+  patch -p0 -i ../ffmpeg-link.patch
+  # fix build with ffmpeg 4.0 (Gentoo)
+  patch -p1 -i ../cinelerra-cv-ffmpeg4.patch
+  # gcc 4.6 workaround
+  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
+  export CPPFLAGS="$CFLAGS"
+  # remove executable stack
+  export LDFLAGS+=" -Wl,-z,noexecstack"
+  autoreconf -vfi
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  # disable mmx due to improper use of registers in asm
+  # 

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD cinelerra-cv-ffmpeg4.patch)

[Antonio Rojas via arch-commits]

Date: Tuesday, May 1, 2018 @ 18:17:07
  Author: arojas
Revision: 318600

ffmpeg 4.0 rebuild

Added:
  cinelerra-cv/trunk/cinelerra-cv-ffmpeg4.patch
Modified:
  cinelerra-cv/trunk/PKGBUILD

+
 PKGBUILD   |   10 +++--
 cinelerra-cv-ffmpeg4.patch |   82 +++
 2 files changed, 89 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-01 17:01:19 UTC (rev 318599)
+++ PKGBUILD2018-05-01 18:17:07 UTC (rev 318600)
@@ -7,7 +7,7 @@
 _name=CinelerraCV
 pkgname=cinelerra-cv
 pkgver=2.3
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc="Professional video editing and compositing environment"
 arch=('x86_64')
@@ -23,7 +23,8 @@
 'ffmpeg2.0.patch'
 'gcc5fix.patch'
 'cinelerra-cv-ffmpeg3.patch'
-'ffmpeg-link.patch')
+'ffmpeg-link.patch'
+'cinelerra-cv-ffmpeg4.patch')
 
sha512sums=('908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e'
 
'0295d71dd4b17051288778f54c57babd4fbfab5be29b71c47caf2bbac614898a7c2c7cb6cb1d093e6237f929f4e765a2fbed363cc34a3481d628ccdda19fe83e'
 
'0882e87b3d8bd99de6c08d61a2569dd4595a90066ee6f697fddedb9f863f4ba3bcfb2b986e7ffeef369151cebf326a128f322d86c3c84602f7b35252f91a9bdb'
@@ -30,7 +31,8 @@
 
'5313820d0030c216710654cb4ba17d33478e7f1d644c668d64e74c0d580d04ba658e68302a85311b2d2792c05a943a546b620ec680847d0324d335b168ba69c7'
 
'b81bc1c5794003486f0ca1f8e5172ed4b0d1b06d2b3c00d5fc665a00b921e128d83e321fd0c41f9508f9f3726908b1f3876b45d4ecc4a32e7ec5e95ede564495'
 
'e7f7c4058e4ea5cd21ed9abcb8383828aef181474b373051a23cbf31e6a68ba728c392fda93c301fd299facfe13e398ad1ccb990fc9ab3a3e4f4fd6238fea905'
-
'bc3729d9a61b9734356162acdcf3c055b2a3fdb162686db9267da97a7e8b28f39637abd8524a6b2e286fbe99bd89d45e1df857048125286fbe6262e470ba6124')
+
'bc3729d9a61b9734356162acdcf3c055b2a3fdb162686db9267da97a7e8b28f39637abd8524a6b2e286fbe99bd89d45e1df857048125286fbe6262e470ba6124'
+
'39af2d3b1e1ce0faaef63db23bebc5466b7ac15a75da58c7119f443ec6c4b06ec9118cea21fa2d5ff98031b7399f24e0a5d2280ebd01dea534377f685e0492de')
 
 prepare() {
   mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
@@ -48,6 +50,8 @@
   # fix build with ffmpeg 3.0
   patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
   patch -p0 -i ../ffmpeg-link.patch
+  # fix build with ffmpeg 4.0 (Gentoo)
+  patch -p1 -i ../cinelerra-cv-ffmpeg4.patch
   # gcc 4.6 workaround
   export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
   export CPPFLAGS="$CFLAGS"

Added: cinelerra-cv-ffmpeg4.patch
===
--- cinelerra-cv-ffmpeg4.patch  (rev 0)
+++ cinelerra-cv-ffmpeg4.patch  2018-05-01 18:17:07 UTC (rev 318600)
@@ -0,0 +1,82 @@
+Index: CinelerraCV-2.3/quicktime/mpeg4.c
+===
+--- CinelerraCV-2.3.orig/quicktime/mpeg4.c
 CinelerraCV-2.3/quicktime/mpeg4.c
+@@ -625,7 +625,6 @@ static int encode(quicktime_t *file, uns
+   else
+ // ffmpeg section
+   {
+-  static char *video_rc_eq="tex^qComp";
+   codec->encode_initialized[current_field] = 1;
+   if(!ffmpeg_initialized)
+   {
+@@ -650,7 +649,6 @@ static int encode(quicktime_t *file, uns
+   context->pix_fmt = AV_PIX_FMT_YUV420P;
+   context->bit_rate = codec->bitrate / 
codec->total_fields;
+   context->bit_rate_tolerance = codec->bitrate_tolerance;
+-  context->rc_eq = video_rc_eq;
+   context->rc_max_rate = 0;
+   context->rc_min_rate = 0;
+   context->rc_buffer_size = 0;
+@@ -658,8 +656,6 @@ static int encode(quicktime_t *file, uns
+   (!codec->fix_bitrate ? codec->quantizer : 2);
+   context->qmax = 
+   (!codec->fix_bitrate ? codec->quantizer : 31);
+-  context->lmin = 2 * FF_QP2LAMBDA;
+-  context->lmax = 31 * FF_QP2LAMBDA;
+   context->mb_lmin = 2 * FF_QP2LAMBDA;
+   context->mb_lmax = 31 * FF_QP2LAMBDA;
+   context->max_qdiff = 3;
+@@ -680,8 +676,6 @@ static int encode(quicktime_t *file, uns
+   context->frame_skip_cmp = FF_CMP_DCTMAX;
+   context->ildct_cmp = FF_CMP_VSAD;
+   context->intra_dc_precision = 0;
+-  context->intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
+-  context->inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
+   context->i_quant_factor = -0.8;
+   context->i_quant_offset = 0.0;
+   

[arch-commits] Commit in cinelerra-cv/repos (8 files)

[David Runge via arch-commits]

Date: Monday, February 26, 2018 @ 23:40:06
  Author: dvzrv
Revision: 298843

archrelease: copy trunk to community-staging-x86_64

Added:
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 298842, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch
(from rev 298842, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg-link.patch
(from rev 298842, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 298842, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 298842, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 298842, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 298842, cinelerra-cv/trunk/v4l1_removal.patch)

+
 PKGBUILD   |   79 
 cinelerra-cv-ffmpeg3.patch |  681 +++
 ffmpeg-link.patch  |   24 +
 ffmpeg2.0.patch|   98 ++
 ffmpeg_api.patch   |  163 ++
 gcc5fix.patch  |   33 ++
 v4l1_removal.patch |  125 +++
 7 files changed, 1203 insertions(+)

Copied: cinelerra-cv/repos/community-staging-x86_64/PKGBUILD (from rev 298842, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-02-26 23:40:06 UTC (rev 298843)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Ray Rashif 
+# Contributor: Daniel J Griffiths 
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Alexander Rødseth 
+
+_name=CinelerraCV
+pkgname=cinelerra-cv
+pkgver=2.3
+pkgrel=3
+epoch=1
+pkgdesc="Professional video editing and compositing environment"
+arch=('x86_64')
+url="https://cinelerra-cv.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
+makedepends=('git' 'nasm' 'mesa')
+source=("https://${pkgname}.org/releases/${_name}-${pkgver}.tar.xz;
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'gcc5fix.patch'
+'cinelerra-cv-ffmpeg3.patch'
+'ffmpeg-link.patch')
+sha512sums=('908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e'
+
'0295d71dd4b17051288778f54c57babd4fbfab5be29b71c47caf2bbac614898a7c2c7cb6cb1d093e6237f929f4e765a2fbed363cc34a3481d628ccdda19fe83e'
+
'0882e87b3d8bd99de6c08d61a2569dd4595a90066ee6f697fddedb9f863f4ba3bcfb2b986e7ffeef369151cebf326a128f322d86c3c84602f7b35252f91a9bdb'
+
'5313820d0030c216710654cb4ba17d33478e7f1d644c668d64e74c0d580d04ba658e68302a85311b2d2792c05a943a546b620ec680847d0324d335b168ba69c7'
+
'b81bc1c5794003486f0ca1f8e5172ed4b0d1b06d2b3c00d5fc665a00b921e128d83e321fd0c41f9508f9f3726908b1f3876b45d4ecc4a32e7ec5e95ede564495'
+
'e7f7c4058e4ea5cd21ed9abcb8383828aef181474b373051a23cbf31e6a68ba728c392fda93c301fd299facfe13e398ad1ccb990fc9ab3a3e4f4fd6238fea905'
+
'bc3729d9a61b9734356162acdcf3c055b2a3fdb162686db9267da97a7e8b28f39637abd8524a6b2e286fbe99bd89d45e1df857048125286fbe6262e470ba6124')
+
+prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+
+  ## Patches (oldest first) ##
+  # v4l1 removal patch
+  patch -Np1 -i "$srcdir/v4l1_removal.patch"
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i "$srcdir/ffmpeg_api.patch"
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
+  # gcc 5.x fix
+  patch -Np1 -i "$srcdir/gcc5fix.patch"
+  # fix build with ffmpeg 3.0
+  patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
+  patch -p0 -i ../ffmpeg-link.patch
+  # gcc 4.6 workaround
+  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
+  export CPPFLAGS="$CFLAGS"
+  # remove executable stack
+  export LDFLAGS+=" -Wl,-z,noexecstack"
+  autoreconf -vfi
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  # disable mmx due to improper use of registers in asm
+  # - possibly a new problem since gcc 4.9
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-mmx \
+  --disable-esd
+  make
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
+-vDm644 {AUTHORS,ChangeLog,NEWS,README.BUILD,TODO}

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[David Runge via arch-commits]

Date: Monday, February 26, 2018 @ 23:39:43
  Author: dvzrv
Revision: 298842

upgpkg: cinelerra-cv 1:2.3-3

Rebuild for ilmbase/openexr 2.2.1 rebuild.
Switching to https for source and url. Using autoreconf in prepare() instead of 
autogen.sh in build().
Moving patches to prepare(). Adding docs.

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |   63 +
 1 file changed, 22 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-26 23:24:10 UTC (rev 298841)
+++ PKGBUILD2018-02-26 23:39:43 UTC (rev 298842)
@@ -4,79 +4,60 @@
 # Contributor: Jaroslaw Swierczynski 
 # Contributor: Alexander Rødseth 
 
+_name=CinelerraCV
 pkgname=cinelerra-cv
 pkgver=2.3
-_gitrel=2.3.0
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Professional video editing and compositing environment"
 arch=('x86_64')
-url="http://cinelerra.org/;
+url="https://cinelerra-cv.org/;
 license=('GPL')
 depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
  'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
 makedepends=('git' 'nasm' 'mesa')
-source=("$pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel"
+source=("https://${pkgname}.org/releases/${_name}-${pkgver}.tar.xz;
 'v4l1_removal.patch'
 'ffmpeg_api.patch'
 'ffmpeg2.0.patch'
 'gcc5fix.patch'
-   'cinelerra-cv-ffmpeg3.patch'
-   'ffmpeg-link.patch')
-md5sums=('SKIP'
- 'bfa85e20809429d88eba4ab83e569612'
- 'b05ec2fb54e7d02f6167525417802111'
- '14dd897084d64cd0b5e9caa8a69818bd'
- '7bf8fe04ce242d8aa76dba94897eac4e'
- '4d45860f1780b5e42fbbfc0e35614cdd'
- '0338a22d2785ef52c908574bb323ab02')
+'cinelerra-cv-ffmpeg3.patch'
+'ffmpeg-link.patch')
+sha512sums=('908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e'
+
'0295d71dd4b17051288778f54c57babd4fbfab5be29b71c47caf2bbac614898a7c2c7cb6cb1d093e6237f929f4e765a2fbed363cc34a3481d628ccdda19fe83e'
+
'0882e87b3d8bd99de6c08d61a2569dd4595a90066ee6f697fddedb9f863f4ba3bcfb2b986e7ffeef369151cebf326a128f322d86c3c84602f7b35252f91a9bdb'
+
'5313820d0030c216710654cb4ba17d33478e7f1d644c668d64e74c0d580d04ba658e68302a85311b2d2792c05a943a546b620ec680847d0324d335b168ba69c7'
+
'b81bc1c5794003486f0ca1f8e5172ed4b0d1b06d2b3c00d5fc665a00b921e128d83e321fd0c41f9508f9f3726908b1f3876b45d4ecc4a32e7ec5e95ede564495'
+
'e7f7c4058e4ea5cd21ed9abcb8383828aef181474b373051a23cbf31e6a68ba728c392fda93c301fd299facfe13e398ad1ccb990fc9ab3a3e4f4fd6238fea905'
+
'bc3729d9a61b9734356162acdcf3c055b2a3fdb162686db9267da97a7e8b28f39637abd8524a6b2e286fbe99bd89d45e1df857048125286fbe6262e470ba6124')
 
 prepare() {
-  cd "$srcdir/$pkgname"
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
   ## Patches (oldest first) ##
-
   # v4l1 removal patch
   patch -Np1 -i "$srcdir/v4l1_removal.patch"
-
   # ffmpeg api patch update for 0.11
   patch -Np1 -i "$srcdir/ffmpeg_api.patch"
-
   # fix avcodec_alloc_context and alloc_open
   patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
-
-  ## Hacks ##
-
-  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
-  # TODO: check if this is still needed (pre-svn commit) --schiv
-  #sed -i '/\/X11R6/s///' configure.in
-
-  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
-  #sed -i -e '/Debian/d' admin/nasm
-
   # gcc 5.x fix
   patch -Np1 -i "$srcdir/gcc5fix.patch"
-
   # fix build with ffmpeg 3.0
   patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
   patch -p0 -i ../ffmpeg-link.patch
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ## More Hacks (must be in existing env) ##
-
   # gcc 4.6 workaround
   export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
   export CPPFLAGS="$CFLAGS"
-
   # remove executable stack
   export LDFLAGS+=" -Wl,-z,noexecstack"
+  autoreconf -vfi
+}
 
-  ./autogen.sh
-
+build() {
+  cd "${pkgname}-${pkgver}"
   # disable mmx due to improper use of registers in asm
   # - possibly a new problem since gcc 4.9
   ./configure --prefix=/usr \
@@ -85,14 +66,14 @@
   --enable-opengl \
   --disable-mmx \
   --disable-esd
-
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname"
-
+  cd "${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir" install
+  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
+-vDm644 {AUTHORS,ChangeLog,NEWS,README.BUILD,TODO}
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in cinelerra-cv/repos (8 files)

[Maxime Gauduin via arch-commits]

Date: Friday, December 29, 2017 @ 17:02:21
  Author: alucryd
Revision: 276869

archrelease: copy trunk to community-staging-x86_64

Added:
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 276868, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch
(from rev 276868, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg-link.patch
(from rev 276868, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 276868, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 276868, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 276868, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 276868, cinelerra-cv/trunk/v4l1_removal.patch)

+
 PKGBUILD   |   98 ++
 cinelerra-cv-ffmpeg3.patch |  681 +++
 ffmpeg-link.patch  |   24 +
 ffmpeg2.0.patch|   98 ++
 ffmpeg_api.patch   |  163 ++
 gcc5fix.patch  |   33 ++
 v4l1_removal.patch |  125 +++
 7 files changed, 1222 insertions(+)

Copied: cinelerra-cv/repos/community-staging-x86_64/PKGBUILD (from rev 276868, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2017-12-29 17:02:21 UTC (rev 276869)
@@ -0,0 +1,98 @@
+# $Id$
+# Maintainer: Ray Rashif 
+# Contributor: Daniel J Griffiths 
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Alexander Rødseth 
+
+pkgname=cinelerra-cv
+pkgver=2.3
+_gitrel=2.3.0
+pkgrel=2
+epoch=1
+pkgdesc="Professional video editing and compositing environment"
+arch=('x86_64')
+url="http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
+makedepends=('git' 'nasm' 'mesa')
+source=("$pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel"
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'gcc5fix.patch'
+   'cinelerra-cv-ffmpeg3.patch'
+   'ffmpeg-link.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '7bf8fe04ce242d8aa76dba94897eac4e'
+ '4d45860f1780b5e42fbbfc0e35614cdd'
+ '0338a22d2785ef52c908574bb323ab02')
+
+prepare() {
+  cd "$srcdir/$pkgname"
+
+  ## Patches (oldest first) ##
+
+  # v4l1 removal patch
+  patch -Np1 -i "$srcdir/v4l1_removal.patch"
+
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i "$srcdir/ffmpeg_api.patch"
+
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
+
+  ## Hacks ##
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: check if this is still needed (pre-svn commit) --schiv
+  #sed -i '/\/X11R6/s///' configure.in
+
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  #sed -i -e '/Debian/d' admin/nasm
+
+  # gcc 5.x fix
+  patch -Np1 -i "$srcdir/gcc5fix.patch"
+
+  # fix build with ffmpeg 3.0
+  patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
+  patch -p0 -i ../ffmpeg-link.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname"
+
+  ## More Hacks (must be in existing env) ##
+
+  # gcc 4.6 workaround
+  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
+  export CPPFLAGS="$CFLAGS"
+
+  # remove executable stack
+  export LDFLAGS+=" -Wl,-z,noexecstack"
+
+  ./autogen.sh
+
+  # disable mmx due to improper use of registers in asm
+  # - possibly a new problem since gcc 4.9
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-mmx \
+  --disable-esd
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch 
(from rev 276868, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
===
--- community-staging-x86_64/cinelerra-cv-ffmpeg3.patch 
(rev 0)
+++ community-staging-x86_64/cinelerra-cv-ffmpeg3.patch 2017-12-29 17:02:21 UTC 
(rev 276869)
@@ -0,0 +1,681 @@
+Index: cinelerra-20140710/cinelerra/ffmpeg.C

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Maxime Gauduin via arch-commits]

Date: Friday, December 29, 2017 @ 17:02:05
  Author: alucryd
Revision: 276868

x264 152 rebuild: cinelerra-cv 1:2.3-2

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-29 14:46:52 UTC (rev 276867)
+++ PKGBUILD2017-12-29 17:02:05 UTC (rev 276868)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.3
 _gitrel=2.3.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Professional video editing and compositing environment"
 arch=('x86_64')

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Antonio Rojas]

Date: Tuesday, August 9, 2016 @ 19:26:24
  Author: arojas
Revision: 186252

Remove dropped patch from source array

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 --
 1 file changed, 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-09 19:18:00 UTC (rev 186251)
+++ PKGBUILD2016-08-09 19:26:24 UTC (rev 186252)
@@ -21,7 +21,6 @@
 'v4l1_removal.patch'
 'ffmpeg_api.patch'
 'ffmpeg2.0.patch'
-'cinelerra-std_and_str_h.patch'
 'gcc5fix.patch'
'cinelerra-cv-ffmpeg3.patch'
'ffmpeg-link.patch')
@@ -29,7 +28,6 @@
  'bfa85e20809429d88eba4ab83e569612'
  'b05ec2fb54e7d02f6167525417802111'
  '14dd897084d64cd0b5e9caa8a69818bd'
- '02d8222e596133bbc05eaad15bef242c'
  '7bf8fe04ce242d8aa76dba94897eac4e'
  '4d45860f1780b5e42fbbfc0e35614cdd'
  '0338a22d2785ef52c908574bb323ab02')

[arch-commits] Commit in cinelerra-cv/repos (16 files)

[Antonio Rojas]

Date: Friday, February 19, 2016 @ 20:55:48
  Author: arojas
Revision: 162599

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 162598, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-cv-ffmpeg3.patch
(from rev 162598, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg-link.patch
(from rev 162598, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 162598, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 162598, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/gcc5fix.patch
(from rev 162598, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 162598, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 162598, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-cv-ffmpeg3.patch
(from rev 162598, cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg-link.patch
(from rev 162598, cinelerra-cv/trunk/ffmpeg-link.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 162598, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 162598, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 162598, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 162598, cinelerra-cv/trunk/v4l1_removal.patch)

-+
 community-staging-i686/PKGBUILD |  100 ++
 community-staging-i686/cinelerra-cv-ffmpeg3.patch   |  681 ++
 community-staging-i686/ffmpeg-link.patch|   24 
 community-staging-i686/ffmpeg2.0.patch  |   98 ++
 community-staging-i686/ffmpeg_api.patch |  163 
 community-staging-i686/gcc5fix.patch|   33 
 community-staging-i686/v4l1_removal.patch   |  125 +++
 community-staging-x86_64/PKGBUILD   |  100 ++
 community-staging-x86_64/cinelerra-cv-ffmpeg3.patch |  681 ++
 community-staging-x86_64/ffmpeg-link.patch  |   24 
 community-staging-x86_64/ffmpeg2.0.patch|   98 ++
 community-staging-x86_64/ffmpeg_api.patch   |  163 
 community-staging-x86_64/gcc5fix.patch  |   33 
 community-staging-x86_64/v4l1_removal.patch |  125 +++
 14 files changed, 2448 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 162598:162599 to see the changes.

[arch-commits] Commit in cinelerra-cv/trunk (4 files)

[Antonio Rojas]

Date: Friday, February 19, 2016 @ 20:54:12
  Author: arojas
Revision: 162598

Update to 2.3, update patches for ffmpeg 3.0

Added:
  cinelerra-cv/trunk/cinelerra-cv-ffmpeg3.patch
  cinelerra-cv/trunk/ffmpeg-link.patch
Modified:
  cinelerra-cv/trunk/PKGBUILD
Deleted:
  cinelerra-cv/trunk/cinelerra-std_and_str_h.patch

---+
 PKGBUILD  |   28 -
 cinelerra-cv-ffmpeg3.patch|  681 
 cinelerra-std_and_str_h.patch |   81 
 ffmpeg-link.patch |   24 +
 4 files changed, 719 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-19 19:32:01 UTC (rev 162597)
+++ PKGBUILD2016-02-19 19:54:12 UTC (rev 162598)
@@ -5,9 +5,9 @@
 # Contributor: Alexander Rødseth 
 
 pkgname=cinelerra-cv
-pkgver=2.2
-_gitrel=2.2.0
-pkgrel=27
+pkgver=2.3
+_gitrel=2.3.0
+pkgrel=1
 epoch=1
 pkgdesc="Professional video editing and compositing environment"
 arch=('x86_64' 'i686')
@@ -15,7 +15,7 @@
 license=('GPL')
 depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
- 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0')
+ 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0' 'libxft')
 makedepends=('git' 'nasm' 'mesa')
 
source=("$pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel"
 'v4l1_removal.patch'
@@ -22,13 +22,17 @@
 'ffmpeg_api.patch'
 'ffmpeg2.0.patch'
 'cinelerra-std_and_str_h.patch'
-'gcc5fix.patch')
+'gcc5fix.patch'
+   'cinelerra-cv-ffmpeg3.patch'
+   'ffmpeg-link.patch')
 md5sums=('SKIP'
  'bfa85e20809429d88eba4ab83e569612'
  'b05ec2fb54e7d02f6167525417802111'
  '14dd897084d64cd0b5e9caa8a69818bd'
  '02d8222e596133bbc05eaad15bef242c'
- '7bf8fe04ce242d8aa76dba94897eac4e')
+ '7bf8fe04ce242d8aa76dba94897eac4e'
+ '4d45860f1780b5e42fbbfc0e35614cdd'
+ '0338a22d2785ef52c908574bb323ab02')
 
 prepare() {
   cd "$srcdir/$pkgname"
@@ -41,9 +45,6 @@
   # ffmpeg api patch update for 0.11
   patch -Np1 -i "$srcdir/ffmpeg_api.patch"
 
-  # fix some missing headers
-  patch -Np0 -i "$srcdir/cinelerra-std_and_str_h.patch"
-
   # fix avcodec_alloc_context and alloc_open
   patch -Np1 -i "$srcdir/ffmpeg2.0.patch"
 
@@ -56,13 +57,12 @@
   # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
   #sed -i -e '/Debian/d' admin/nasm
 
-  # ffmpeg 2.0 related replacements
-  # TODO: super slow on HDDs, but proper patch requires merging with others
-  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
-  find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \;
-
   # gcc 5.x fix
   patch -Np1 -i "$srcdir/gcc5fix.patch"
+
+  # fix build with ffmpeg 3.0
+  patch -p1 -i ../cinelerra-cv-ffmpeg3.patch
+  patch -p0 -i ../ffmpeg-link.patch
 }
 
 build() {

Added: cinelerra-cv-ffmpeg3.patch
===
--- cinelerra-cv-ffmpeg3.patch  (rev 0)
+++ cinelerra-cv-ffmpeg3.patch  2016-02-19 19:54:12 UTC (rev 162598)
@@ -0,0 +1,681 @@
+Index: cinelerra-20140710/cinelerra/ffmpeg.C
+===
+--- ffmpeg.C.orig  2016-02-19 19:37:33.634278174 +
 ffmpeg.C   2016-02-19 19:39:37.540403052 +
+@@ -25,20 +25,20 @@
+ 
+   avcodec_register_all();
+ 
+-  CodecID id = codec_id(codec_string);
++  AVCodecID id = codec_id(codec_string);
+   codec = avcodec_find_decoder(id);
+   if (codec == NULL) {
+   printf("FFMPEG::init no decoder for '%s'", codec_string);
+   return 1;
+   }
+ 
+   context = avcodec_alloc_context3(codec);
+ 
+   if (avcodec_open2(context, codec,NULL)) {
+   printf("FFMPEG::init avcodec_open() failed\n");
+   }
+ 
+-  picture = avcodec_alloc_frame();
++  picture = av_frame_alloc();
+ 
+ 
+   return 0;
+@@ -51,66 +51,66 @@
+ }
+ 
+ 
+-CodecID FFMPEG::codec_id(char *codec_string) {
++AVCodecID FFMPEG::codec_id(char *codec_string) {
+ #define CODEC_IS(x) (! strncmp(codec_string, x, 4))
+ 
+   if (CODEC_IS(QUICKTIME_DV) ||
+-  CODEC_IS(QUICKTIME_DVSD)) return CODEC_ID_DVVIDEO;
++  CODEC_IS(QUICKTIME_DVSD)) return AV_CODEC_ID_DVVIDEO;
+   
+   if (CODEC_IS(QUICKTIME_MP4V) ||
+-  CODEC_IS(QUICKTIME_DIVX)) return CODEC_ID_MPEG4;
++  CODEC_IS(QUICKTIME_DIVX)) return AV_CODEC_ID_MPEG4;
+ 
+-  return CODEC_ID_NONE;
++  return AV_CODEC_ID_NONE;
+ 
+ #undef CODEC_IS
+ }
+ 
+-PixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
++AVPixelFormat FFMPEG::color_model_to_pix_fmt(int color_model) {
+   switch (color_model) 
+   { 
+   case BC_YUV422: 
+-return PIX_FMT_YUYV422;
++  

[arch-commits] Commit in cinelerra-cv/repos (14 files)

[Felix Yan]

Date: Monday, December 7, 2015 @ 08:24:33
  Author: fyan
Revision: 149703

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 149702, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch
(from rev 149702, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 149702, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 149702, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/gcc5fix.patch
(from rev 149702, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 149702, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 149702, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 149702, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 149702, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 149702, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/gcc5fix.patch
(from rev 149702, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 149702, cinelerra-cv/trunk/v4l1_removal.patch)

+
 community-staging-i686/PKGBUILD|  100 +
 community-staging-i686/cinelerra-std_and_str_h.patch   |   81 +++
 community-staging-i686/ffmpeg2.0.patch |   98 +
 community-staging-i686/ffmpeg_api.patch|  163 +++
 community-staging-i686/gcc5fix.patch   |   33 +++
 community-staging-i686/v4l1_removal.patch  |  125 +++
 community-staging-x86_64/PKGBUILD  |  100 +
 community-staging-x86_64/cinelerra-std_and_str_h.patch |   81 +++
 community-staging-x86_64/ffmpeg2.0.patch   |   98 +
 community-staging-x86_64/ffmpeg_api.patch  |  163 +++
 community-staging-x86_64/gcc5fix.patch |   33 +++
 community-staging-x86_64/v4l1_removal.patch|  125 +++
 12 files changed, 1200 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 149702:149703 to see the changes.

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Felix Yan]

Date: Monday, December 7, 2015 @ 08:23:29
  Author: fyan
Revision: 149702

C++11 ABI rebuild

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 07:22:00 UTC (rev 149701)
+++ PKGBUILD2015-12-07 07:23:29 UTC (rev 149702)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=26
+pkgrel=27
 epoch=1
 pkgdesc="Professional video editing and compositing environment"
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Maxime Gauduin]

Date: Tuesday, July 21, 2015 @ 15:57:04
  Author: alucryd
Revision: 137214

libx264 soname bump: cinelerra-cv 1:2.2-26

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-21 13:46:01 UTC (rev 137213)
+++ PKGBUILD2015-07-21 13:57:04 UTC (rev 137214)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=25
+pkgrel=26
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/repos (22 files)

[Maxime Gauduin]

Date: Tuesday, July 21, 2015 @ 15:57:45
  Author: alucryd
Revision: 137215

archrelease: copy trunk to community-x86_64, community-i686

Added:
  cinelerra-cv/repos/community-i686/PKGBUILD
(from rev 137214, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-i686/cinelerra-std_and_str_h.patch
(from rev 137214, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-i686/ffmpeg2.0.patch
(from rev 137214, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-i686/ffmpeg_api.patch
(from rev 137214, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-i686/gcc5fix.patch
(from rev 137214, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-i686/v4l1_removal.patch
(from rev 137214, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-x86_64/PKGBUILD
(from rev 137214, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-x86_64/cinelerra-std_and_str_h.patch
(from rev 137214, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-x86_64/ffmpeg2.0.patch
(from rev 137214, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-x86_64/ffmpeg_api.patch
(from rev 137214, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-x86_64/gcc5fix.patch
(from rev 137214, cinelerra-cv/trunk/gcc5fix.patch)
  cinelerra-cv/repos/community-x86_64/v4l1_removal.patch
(from rev 137214, cinelerra-cv/trunk/v4l1_removal.patch)
Deleted:
  cinelerra-cv/repos/community-i686/PKGBUILD
  cinelerra-cv/repos/community-i686/cinelerra-std_and_str_h.patch
  cinelerra-cv/repos/community-i686/ffmpeg2.0.patch
  cinelerra-cv/repos/community-i686/ffmpeg_api.patch
  cinelerra-cv/repos/community-i686/v4l1_removal.patch
  cinelerra-cv/repos/community-x86_64/PKGBUILD
  cinelerra-cv/repos/community-x86_64/cinelerra-std_and_str_h.patch
  cinelerra-cv/repos/community-x86_64/ffmpeg2.0.patch
  cinelerra-cv/repos/community-x86_64/ffmpeg_api.patch
  cinelerra-cv/repos/community-x86_64/v4l1_removal.patch

+
 /PKGBUILD  |  200 ++
 /cinelerra-std_and_str_h.patch |  162 +++
 /ffmpeg2.0.patch   |  196 +
 /ffmpeg_api.patch  |  326 +++
 /v4l1_removal.patch|  250 +
 community-i686/PKGBUILD|  105 ---
 community-i686/cinelerra-std_and_str_h.patch   |   81 -
 community-i686/ffmpeg2.0.patch |   98 --
 community-i686/ffmpeg_api.patch|  163 ---
 community-i686/gcc5fix.patch   |   33 ++
 community-i686/v4l1_removal.patch  |  125 
 community-x86_64/PKGBUILD  |  105 ---
 community-x86_64/cinelerra-std_and_str_h.patch |   81 -
 community-x86_64/ffmpeg2.0.patch   |   98 --
 community-x86_64/ffmpeg_api.patch  |  163 ---
 community-x86_64/gcc5fix.patch |   33 ++
 community-x86_64/v4l1_removal.patch|  125 
 17 files changed, 1200 insertions(+), 1144 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 137214:137215 to see the changes.

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Ray Rashif]

Date: Wednesday, June 10, 2015 @ 10:40:52
  Author: schiv
Revision: 135120

cinelerra-cv: disable mmx for all archs

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |   22 --
 1 file changed, 8 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-10 08:33:29 UTC (rev 135119)
+++ PKGBUILD2015-06-10 08:40:52 UTC (rev 135120)
@@ -30,14 +30,6 @@
  '02d8222e596133bbc05eaad15bef242c'
  '7bf8fe04ce242d8aa76dba94897eac4e')
 
-_confit() {
-  ./configure --prefix=/usr \
-  --with-buildinfo=git/recompile \
-  --with-external-ffmpeg \
-  --enable-opengl \
-  --disable-esd $@
-}
-
 prepare() {
   cd $srcdir/$pkgname
 
@@ -87,12 +79,14 @@
 
   ./autogen.sh
 
-  # asm failure for mmx on x64
-  if [ $CARCH = 'x86_64' ]; then
-_confit --disable-mmx
-  else
-_confit --enable-mmx
-  fi
+  # disable mmx due to improper use of registers in asm
+  # - possibly a new problem since gcc 4.9
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-mmx \
+  --disable-esd
 
   make
 }

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD gcc5fix.patch)

[Ray Rashif]

Date: Tuesday, June 9, 2015 @ 23:43:14
  Author: schiv
Revision: 135108

cinelerra-cv: gcc 5.x fix and some cleanup

Added:
  cinelerra-cv/trunk/gcc5fix.patch
Modified:
  cinelerra-cv/trunk/PKGBUILD

---+
 PKGBUILD  |   21 +++--
 gcc5fix.patch |   33 +
 2 files changed, 44 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-09 19:38:03 UTC (rev 135107)
+++ PKGBUILD2015-06-09 21:43:14 UTC (rev 135108)
@@ -21,12 +21,14 @@
 'v4l1_removal.patch'
 'ffmpeg_api.patch'
 'ffmpeg2.0.patch'
-'cinelerra-std_and_str_h.patch')
+'cinelerra-std_and_str_h.patch'
+'gcc5fix.patch')
 md5sums=('SKIP'
  'bfa85e20809429d88eba4ab83e569612'
  'b05ec2fb54e7d02f6167525417802111'
  '14dd897084d64cd0b5e9caa8a69818bd'
- '02d8222e596133bbc05eaad15bef242c')
+ '02d8222e596133bbc05eaad15bef242c'
+ '7bf8fe04ce242d8aa76dba94897eac4e')
 
 _confit() {
   ./configure --prefix=/usr \
@@ -57,19 +59,18 @@
 
   # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
   # TODO: check if this is still needed (pre-svn commit) --schiv
-  sed -i '/\/X11R6/s///' configure.in
+  #sed -i '/\/X11R6/s///' configure.in
 
   # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
-  sed -i -e '/Debian/d' admin/nasm
+  #sed -i -e '/Debian/d' admin/nasm
 
-  # fix some pngs that break with newer libpng
-  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
-  #msg2 Fixing PNGs, please wait...
-  #find -name '*.png' -exec optipng -quiet -force -fix {} +
-
   # ffmpeg 2.0 related replacements
+  # TODO: super slow on HDDs, but proper patch requires merging with others
   find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
   find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \;
+
+  # gcc 5.x fix
+  patch -Np1 -i $srcdir/gcc5fix.patch
 }
 
 build() {
@@ -86,7 +87,7 @@
 
   ./autogen.sh
 
-  # TODO: check if this is still needed (pre-svn commit) --schiv
+  # asm failure for mmx on x64
   if [ $CARCH = 'x86_64' ]; then
 _confit --disable-mmx
   else

Added: gcc5fix.patch
===
--- gcc5fix.patch   (rev 0)
+++ gcc5fix.patch   2015-06-09 21:43:14 UTC (rev 135108)
@@ -0,0 +1,33 @@
+From e534e852308abaa667c2579bc0025b0c89689b6f Mon Sep 17 00:00:00 2001
+From: Rashif Rahman (Ray) sc...@archlinux.org
+Date: Wed, 10 Jun 2015 02:06:36 +
+Subject: [PATCH] GCC 5.x inline function semantics fix
+
+The compiler will warn and the linker will fail if an inline
+function is declared but not defined in the same translation
+unit. This fixes the problem by prepending 'extern' to the
+declaration in the header file.
+
+For a proper explanation see:
+https://gcc.gnu.org/gcc-5/porting_to.html
+
+---
+ toolame-02l/bitstream.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/toolame-02l/bitstream.h b/toolame-02l/bitstream.h
+index 66f8ae4..db67ac5 100644
+--- a/toolame-02l/bitstream.h
 b/toolame-02l/bitstream.h
+@@ -9,7 +9,7 @@ unsigned int get1bit (Bit_stream_struc *);
+ void put1bit (Bit_stream_struc *, int);
+ unsigned long look_ahead (Bit_stream_struc *, int);
+ unsigned long getbits (Bit_stream_struc *, int);
+-INLINE void putbits (Bit_stream_struc *, unsigned int, int);
++extern INLINE void putbits (Bit_stream_struc *, unsigned int, int);
+ void byte_ali_putbits (Bit_stream_struc *, unsigned int, int);
+ unsigned long byte_ali_getbits (Bit_stream_struc *, int);
+ unsigned long sstell (Bit_stream_struc *);
+--
+2.4.2
+

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Ray Rashif]

Date: Friday, May 8, 2015 @ 21:25:29
  Author: schiv
Revision: 132992

upgpkg: cinelerra-cv 1:2.2-25

openexr 2.2.0 / ilmbase 2.20 rebuild

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-08 19:17:34 UTC (rev 132991)
+++ PKGBUILD2015-05-08 19:25:29 UTC (rev 132992)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=24
+pkgrel=25
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/repos (20 files)

[Ray Rashif]

Date: Friday, May 8, 2015 @ 21:25:53
  Author: schiv
Revision: 132993

archrelease: copy trunk to community-x86_64, community-i686

Added:
  cinelerra-cv/repos/community-i686/PKGBUILD
(from rev 132992, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-i686/cinelerra-std_and_str_h.patch
(from rev 132992, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-i686/ffmpeg2.0.patch
(from rev 132992, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-i686/ffmpeg_api.patch
(from rev 132992, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-i686/v4l1_removal.patch
(from rev 132992, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-x86_64/PKGBUILD
(from rev 132992, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-x86_64/cinelerra-std_and_str_h.patch
(from rev 132992, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-x86_64/ffmpeg2.0.patch
(from rev 132992, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-x86_64/ffmpeg_api.patch
(from rev 132992, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-x86_64/v4l1_removal.patch
(from rev 132992, cinelerra-cv/trunk/v4l1_removal.patch)
Deleted:
  cinelerra-cv/repos/community-i686/PKGBUILD
  cinelerra-cv/repos/community-i686/cinelerra-std_and_str_h.patch
  cinelerra-cv/repos/community-i686/ffmpeg2.0.patch
  cinelerra-cv/repos/community-i686/ffmpeg_api.patch
  cinelerra-cv/repos/community-i686/v4l1_removal.patch
  cinelerra-cv/repos/community-x86_64/PKGBUILD
  cinelerra-cv/repos/community-x86_64/cinelerra-std_and_str_h.patch
  cinelerra-cv/repos/community-x86_64/ffmpeg2.0.patch
  cinelerra-cv/repos/community-x86_64/ffmpeg_api.patch
  cinelerra-cv/repos/community-x86_64/v4l1_removal.patch

+
 /PKGBUILD  |  210 ++
 /cinelerra-std_and_str_h.patch |  162 +++
 /ffmpeg2.0.patch   |  196 +
 /ffmpeg_api.patch  |  326 +++
 /v4l1_removal.patch|  250 +
 community-i686/PKGBUILD|  105 ---
 community-i686/cinelerra-std_and_str_h.patch   |   81 -
 community-i686/ffmpeg2.0.patch |   98 --
 community-i686/ffmpeg_api.patch|  163 ---
 community-i686/v4l1_removal.patch  |  125 
 community-x86_64/PKGBUILD  |  105 ---
 community-x86_64/cinelerra-std_and_str_h.patch |   81 -
 community-x86_64/ffmpeg2.0.patch   |   98 --
 community-x86_64/ffmpeg_api.patch  |  163 ---
 community-x86_64/v4l1_removal.patch|  125 
 15 files changed, 1144 insertions(+), 1144 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 132992:132993 to see the changes.

[arch-commits] Commit in cinelerra-cv/repos (12 files)

[Evangelos Foutras]

Date: Wednesday, March 11, 2015 @ 13:28:06
  Author: foutrelis
Revision: 129073

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 129072, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch
(from rev 129072, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 129072, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 129072, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 129072, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 129072, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 129072, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 129072, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 129072, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 129072, cinelerra-cv/trunk/v4l1_removal.patch)

+
 community-staging-i686/PKGBUILD|  105 +
 community-staging-i686/cinelerra-std_and_str_h.patch   |   81 +++
 community-staging-i686/ffmpeg2.0.patch |   98 +
 community-staging-i686/ffmpeg_api.patch|  163 +++
 community-staging-i686/v4l1_removal.patch  |  125 +++
 community-staging-x86_64/PKGBUILD  |  105 +
 community-staging-x86_64/cinelerra-std_and_str_h.patch |   81 +++
 community-staging-x86_64/ffmpeg2.0.patch   |   98 +
 community-staging-x86_64/ffmpeg_api.patch  |  163 +++
 community-staging-x86_64/v4l1_removal.patch|  125 +++
 10 files changed, 1144 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 129072, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-03-11 12:28:06 UTC (rev 129073)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=24
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+source=($pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'cinelerra-std_and_str_h.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '02d8222e596133bbc05eaad15bef242c')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  ## Patches (oldest first) ##
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # fix some missing headers
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i $srcdir/ffmpeg2.0.patch
+
+  ## Hacks ##
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: check if this is still needed (pre-svn commit) --schiv
+  sed -i '/\/X11R6/s///' configure.in
+
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # fix some pngs that break with newer libpng
+  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
+  #msg2 Fixing PNGs, please wait...
+  #find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+  # ffmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
+  find 

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Wednesday, March 11, 2015 @ 13:27:49
  Author: foutrelis
Revision: 129072

upgpkg: cinelerra-cv 1:2.2-24

libx264.so.144 rebuild.

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-11 11:55:22 UTC (rev 129071)
+++ PKGBUILD2015-03-11 12:27:49 UTC (rev 129072)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=23
+pkgrel=24
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

Date: Monday, September 15, 2014 @ 23:50:51
  Author: bpiotrowski
Revision: 119036

upgpkg: cinelerra-cv 1:2.2-23

rebuild against ffmpeg 2.4

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-15 19:09:27 UTC (rev 119035)
+++ PKGBUILD2014-09-15 21:50:51 UTC (rev 119036)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=22
+pkgrel=23
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/repos (12 files)

[Bartłomiej Piotrowski]

Date: Monday, September 15, 2014 @ 23:50:59
  Author: bpiotrowski
Revision: 119037

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 119036, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch
(from rev 119036, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 119036, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 119036, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 119036, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 119036, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 119036, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 119036, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 119036, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 119036, cinelerra-cv/trunk/v4l1_removal.patch)

+
 community-staging-i686/PKGBUILD|  105 +
 community-staging-i686/cinelerra-std_and_str_h.patch   |   81 +++
 community-staging-i686/ffmpeg2.0.patch |   98 +
 community-staging-i686/ffmpeg_api.patch|  163 +++
 community-staging-i686/v4l1_removal.patch  |  125 +++
 community-staging-x86_64/PKGBUILD  |  105 +
 community-staging-x86_64/cinelerra-std_and_str_h.patch |   81 +++
 community-staging-x86_64/ffmpeg2.0.patch   |   98 +
 community-staging-x86_64/ffmpeg_api.patch  |  163 +++
 community-staging-x86_64/v4l1_removal.patch|  125 +++
 10 files changed, 1144 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 119036, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-09-15 21:50:59 UTC (rev 119037)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=23
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+source=($pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'cinelerra-std_and_str_h.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '02d8222e596133bbc05eaad15bef242c')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  ## Patches (oldest first) ##
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # fix some missing headers
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i $srcdir/ffmpeg2.0.patch
+
+  ## Hacks ##
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: check if this is still needed (pre-svn commit) --schiv
+  sed -i '/\/X11R6/s///' configure.in
+
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # fix some pngs that break with newer libpng
+  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
+  #msg2 Fixing PNGs, please wait...
+  #find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+  # ffmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
+  

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Ray Rashif]

Date: Friday, May 16, 2014 @ 11:20:00
  Author: schiv
Revision: 111303

upgpkg: cinelerra-cv 1:2.2-22

openexr 2.1.0 rebuild

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-16 09:17:58 UTC (rev 111302)
+++ PKGBUILD2014-05-16 09:20:00 UTC (rev 111303)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=21
+pkgrel=22
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/repos (12 files)

[Ray Rashif]

Date: Friday, May 16, 2014 @ 11:20:23
  Author: schiv
Revision: 111304

archrelease: copy trunk to staging-x86_64, staging-i686

Added:
  cinelerra-cv/repos/staging-i686/
  cinelerra-cv/repos/staging-i686/PKGBUILD
(from rev 111303, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/staging-i686/cinelerra-std_and_str_h.patch
(from rev 111303, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/staging-i686/ffmpeg2.0.patch
(from rev 111303, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/staging-i686/ffmpeg_api.patch
(from rev 111303, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/staging-i686/v4l1_removal.patch
(from rev 111303, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/staging-x86_64/
  cinelerra-cv/repos/staging-x86_64/PKGBUILD
(from rev 111303, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 111303, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/staging-x86_64/ffmpeg2.0.patch
(from rev 111303, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/staging-x86_64/ffmpeg_api.patch
(from rev 111303, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/staging-x86_64/v4l1_removal.patch
(from rev 111303, cinelerra-cv/trunk/v4l1_removal.patch)

--+
 staging-i686/PKGBUILD|  105 
 staging-i686/cinelerra-std_and_str_h.patch   |   81 
 staging-i686/ffmpeg2.0.patch |   98 +++
 staging-i686/ffmpeg_api.patch|  163 +
 staging-i686/v4l1_removal.patch  |  125 +++
 staging-x86_64/PKGBUILD  |  105 
 staging-x86_64/cinelerra-std_and_str_h.patch |   81 
 staging-x86_64/ffmpeg2.0.patch   |   98 +++
 staging-x86_64/ffmpeg_api.patch  |  163 +
 staging-x86_64/v4l1_removal.patch|  125 +++
 10 files changed, 1144 insertions(+)

Copied: cinelerra-cv/repos/staging-i686/PKGBUILD (from rev 111303, 
cinelerra-cv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-05-16 09:20:23 UTC (rev 111304)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=22
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+source=($pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'cinelerra-std_and_str_h.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '02d8222e596133bbc05eaad15bef242c')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  ## Patches (oldest first) ##
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # fix some missing headers
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i $srcdir/ffmpeg2.0.patch
+
+  ## Hacks ##
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: check if this is still needed (pre-svn commit) --schiv
+  sed -i '/\/X11R6/s///' configure.in
+
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # fix some pngs that break with newer libpng
+  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
+  #msg2 Fixing PNGs, please wait...
+  #find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+  # ffmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
+  find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \;
+}
+
+build() {
+  cd $srcdir/$pkgname
+
+  ## More Hacks (must be in existing env) ##
+
+  # gcc 4.6 workaround
+  export CFLAGS+= -Wwrite-strings 

[arch-commits] Commit in cinelerra-cv/repos (staging-i686 staging-x86_64)

[Ray Rashif]

Date: Friday, May 16, 2014 @ 11:27:14
  Author: schiv
Revision: 111305

fix cinelerra-cv wrong release commit

Deleted:
  cinelerra-cv/repos/staging-i686/
  cinelerra-cv/repos/staging-x86_64/

[arch-commits] Commit in cinelerra-cv/repos (12 files)

[Ray Rashif]

Date: Friday, May 16, 2014 @ 12:03:19
  Author: schiv
Revision: 111308

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 111307, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch
(from rev 111307, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 111307, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 111307, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 111307, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 111307, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 111307, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 111307, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 111307, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 111307, cinelerra-cv/trunk/v4l1_removal.patch)

+
 community-staging-i686/PKGBUILD|  105 +
 community-staging-i686/cinelerra-std_and_str_h.patch   |   81 +++
 community-staging-i686/ffmpeg2.0.patch |   98 +
 community-staging-i686/ffmpeg_api.patch|  163 +++
 community-staging-i686/v4l1_removal.patch  |  125 +++
 community-staging-x86_64/PKGBUILD  |  105 +
 community-staging-x86_64/cinelerra-std_and_str_h.patch |   81 +++
 community-staging-x86_64/ffmpeg2.0.patch   |   98 +
 community-staging-x86_64/ffmpeg_api.patch  |  163 +++
 community-staging-x86_64/v4l1_removal.patch|  125 +++
 10 files changed, 1144 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 111307, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-05-16 10:03:19 UTC (rev 111308)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=22
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+source=($pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'cinelerra-std_and_str_h.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '02d8222e596133bbc05eaad15bef242c')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  ## Patches (oldest first) ##
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # fix some missing headers
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i $srcdir/ffmpeg2.0.patch
+
+  ## Hacks ##
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: check if this is still needed (pre-svn commit) --schiv
+  sed -i '/\/X11R6/s///' configure.in
+
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # fix some pngs that break with newer libpng
+  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
+  #msg2 Fixing PNGs, please wait...
+  #find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+  # ffmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
+  find -type f 

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

Date: Tuesday, March 25, 2014 @ 12:56:31
  Author: bpiotrowski
Revision: 108247

upgpkg: cinelerra-cv 1:2.2-21

rebuild against libx264 20140311

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-25 11:31:26 UTC (rev 108246)
+++ PKGBUILD2014-03-25 11:56:31 UTC (rev 108247)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=20
+pkgrel=21
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/repos (12 files)

[Bartłomiej Piotrowski]

Date: Tuesday, March 25, 2014 @ 12:56:41
  Author: bpiotrowski
Revision: 108248

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 108247, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch
(from rev 108247, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 108247, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 108247, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 108247, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 108247, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 108247, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 108247, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 108247, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 108247, cinelerra-cv/trunk/v4l1_removal.patch)

+
 community-staging-i686/PKGBUILD|  105 +
 community-staging-i686/cinelerra-std_and_str_h.patch   |   81 +++
 community-staging-i686/ffmpeg2.0.patch |   98 +
 community-staging-i686/ffmpeg_api.patch|  163 +++
 community-staging-i686/v4l1_removal.patch  |  125 +++
 community-staging-x86_64/PKGBUILD  |  105 +
 community-staging-x86_64/cinelerra-std_and_str_h.patch |   81 +++
 community-staging-x86_64/ffmpeg2.0.patch   |   98 +
 community-staging-x86_64/ffmpeg_api.patch  |  163 +++
 community-staging-x86_64/v4l1_removal.patch|  125 +++
 10 files changed, 1144 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 108247, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-03-25 11:56:41 UTC (rev 108248)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=21
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+source=($pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'cinelerra-std_and_str_h.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '02d8222e596133bbc05eaad15bef242c')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  ## Patches (oldest first) ##
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # fix some missing headers
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i $srcdir/ffmpeg2.0.patch
+
+  ## Hacks ##
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: check if this is still needed (pre-svn commit) --schiv
+  sed -i '/\/X11R6/s///' configure.in
+
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # fix some pngs that break with newer libpng
+  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
+  #msg2 Fixing PNGs, please wait...
+  #find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+  # ffmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
+  find 

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Thursday, March 13, 2014 @ 00:06:15
  Author: foutrelis
Revision: 107125

upgpkg: cinelerra-cv 1:2.2-20

mjpegtools 2.1.0 rebuild.

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-12 21:52:55 UTC (rev 107124)
+++ PKGBUILD2014-03-12 23:06:15 UTC (rev 107125)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=19
+pkgrel=20
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')
@@ -17,7 +17,7 @@
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
  'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
 makedepends=('git' 'nasm' 'mesa')
-source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
+source=($pkgname::git+git://git.cinelerra-cv.org/CinelerraCV.git#branch=rel$_gitrel
 'v4l1_removal.patch'
 'ffmpeg_api.patch'
 'ffmpeg2.0.patch'

[arch-commits] Commit in cinelerra-cv/repos (20 files)

[Evangelos Foutras]

Date: Thursday, March 13, 2014 @ 00:06:38
  Author: foutrelis
Revision: 107126

archrelease: copy trunk to community-x86_64, community-i686

Added:
  cinelerra-cv/repos/community-i686/PKGBUILD
(from rev 107125, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-i686/cinelerra-std_and_str_h.patch
(from rev 107125, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-i686/ffmpeg2.0.patch
(from rev 107125, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-i686/ffmpeg_api.patch
(from rev 107125, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-i686/v4l1_removal.patch
(from rev 107125, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-x86_64/PKGBUILD
(from rev 107125, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-x86_64/cinelerra-std_and_str_h.patch
(from rev 107125, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-x86_64/ffmpeg2.0.patch
(from rev 107125, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-x86_64/ffmpeg_api.patch
(from rev 107125, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-x86_64/v4l1_removal.patch
(from rev 107125, cinelerra-cv/trunk/v4l1_removal.patch)
Deleted:
  cinelerra-cv/repos/community-i686/PKGBUILD
  cinelerra-cv/repos/community-i686/cinelerra-std_and_str_h.patch
  cinelerra-cv/repos/community-i686/ffmpeg2.0.patch
  cinelerra-cv/repos/community-i686/ffmpeg_api.patch
  cinelerra-cv/repos/community-i686/v4l1_removal.patch
  cinelerra-cv/repos/community-x86_64/PKGBUILD
  cinelerra-cv/repos/community-x86_64/cinelerra-std_and_str_h.patch
  cinelerra-cv/repos/community-x86_64/ffmpeg2.0.patch
  cinelerra-cv/repos/community-x86_64/ffmpeg_api.patch
  cinelerra-cv/repos/community-x86_64/v4l1_removal.patch

+
 /PKGBUILD  |  210 ++
 /cinelerra-std_and_str_h.patch |  162 +++
 /ffmpeg2.0.patch   |  196 +
 /ffmpeg_api.patch  |  326 +++
 /v4l1_removal.patch|  250 +
 community-i686/PKGBUILD|  105 ---
 community-i686/cinelerra-std_and_str_h.patch   |   81 -
 community-i686/ffmpeg2.0.patch |   98 --
 community-i686/ffmpeg_api.patch|  163 ---
 community-i686/v4l1_removal.patch  |  125 
 community-x86_64/PKGBUILD  |  105 ---
 community-x86_64/cinelerra-std_and_str_h.patch |   81 -
 community-x86_64/ffmpeg2.0.patch   |   98 --
 community-x86_64/ffmpeg_api.patch  |  163 ---
 community-x86_64/v4l1_removal.patch|  125 
 15 files changed, 1144 insertions(+), 1144 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 107125:107126 to see the changes.

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Saturday, November 9, 2013 @ 18:07:27
  Author: foutrelis
Revision: 100734

upgpkg: cinelerra-cv 1:2.2-19

libx264.so.138 rebuild.

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-09 17:06:15 UTC (rev 100733)
+++ PKGBUILD2013-11-09 17:07:27 UTC (rev 100734)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=18
+pkgrel=19
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/repos (12 files)

[Evangelos Foutras]

Date: Saturday, November 9, 2013 @ 18:07:42
  Author: foutrelis
Revision: 100735

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 100734, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch
(from rev 100734, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 100734, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 100734, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 100734, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 100734, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 100734, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 100734, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 100734, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 100734, cinelerra-cv/trunk/v4l1_removal.patch)

+
 community-staging-i686/PKGBUILD|  105 +
 community-staging-i686/cinelerra-std_and_str_h.patch   |   81 +++
 community-staging-i686/ffmpeg2.0.patch |   98 +
 community-staging-i686/ffmpeg_api.patch|  163 +++
 community-staging-i686/v4l1_removal.patch  |  125 +++
 community-staging-x86_64/PKGBUILD  |  105 +
 community-staging-x86_64/cinelerra-std_and_str_h.patch |   81 +++
 community-staging-x86_64/ffmpeg2.0.patch   |   98 +
 community-staging-x86_64/ffmpeg_api.patch  |  163 +++
 community-staging-x86_64/v4l1_removal.patch|  125 +++
 10 files changed, 1144 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 100734, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-11-09 17:07:42 UTC (rev 100735)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=19
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg_api.patch'
+'ffmpeg2.0.patch'
+'cinelerra-std_and_str_h.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '02d8222e596133bbc05eaad15bef242c')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  ## Patches (oldest first) ##
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # fix some missing headers
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
+  # fix avcodec_alloc_context and alloc_open
+  patch -Np1 -i $srcdir/ffmpeg2.0.patch
+
+  ## Hacks ##
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: check if this is still needed (pre-svn commit) --schiv
+  sed -i '/\/X11R6/s///' configure.in
+
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # fix some pngs that break with newer libpng
+  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
+  #msg2 Fixing PNGs, please wait...
+  #find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+  # ffmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
+  find 

[arch-commits] Commit in cinelerra-cv (3 files)

[Allan McRae]

Date: Thursday, October 31, 2013 @ 00:09:24
  Author: allan
Revision: 99707

remove !libtool

Modified:
  cinelerra-cv/repos/community-i686/PKGBUILD
  cinelerra-cv/repos/community-x86_64/PKGBUILD
  cinelerra-cv/trunk/PKGBUILD

-+
 repos/community-i686/PKGBUILD   |1 -
 repos/community-x86_64/PKGBUILD |1 -
 trunk/PKGBUILD  |1 -
 3 files changed, 3 deletions(-)

Modified: repos/community-i686/PKGBUILD
===
--- repos/community-i686/PKGBUILD   2013-10-30 23:09:03 UTC (rev 99706)
+++ repos/community-i686/PKGBUILD   2013-10-30 23:09:24 UTC (rev 99707)
@@ -17,7 +17,6 @@
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
  'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
 makedepends=('git' 'nasm' 'mesa')
-options=('!libtool')
 
source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
 'v4l1_removal.patch'
 'ffmpeg_api.patch'

Modified: repos/community-x86_64/PKGBUILD
===
--- repos/community-x86_64/PKGBUILD 2013-10-30 23:09:03 UTC (rev 99706)
+++ repos/community-x86_64/PKGBUILD 2013-10-30 23:09:24 UTC (rev 99707)
@@ -17,7 +17,6 @@
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
  'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
 makedepends=('git' 'nasm' 'mesa')
-options=('!libtool')
 
source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
 'v4l1_removal.patch'
 'ffmpeg_api.patch'

Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD  2013-10-30 23:09:03 UTC (rev 99706)
+++ trunk/PKGBUILD  2013-10-30 23:09:24 UTC (rev 99707)
@@ -17,7 +17,6 @@
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
  'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
 makedepends=('git' 'nasm' 'mesa')
-options=('!libtool')
 
source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
 'v4l1_removal.patch'
 'ffmpeg_api.patch'

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD ffmpeg2.0.patch)

[Ray Rashif]

Date: Sunday, September 15, 2013 @ 21:52:15
  Author: schiv
Revision: 97245

upgpkg: cinelerra-cv 1:2.2-18

fix ffmpeg 2.0 patch; closes FS#36685

Modified:
  cinelerra-cv/trunk/PKGBUILD
  cinelerra-cv/trunk/ffmpeg2.0.patch

-+
 PKGBUILD|   51 +++
 ffmpeg2.0.patch |2 +-
 2 files changed, 28 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-15 19:11:31 UTC (rev 97244)
+++ PKGBUILD2013-09-15 19:52:15 UTC (rev 97245)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=17
+pkgrel=18
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')
@@ -16,17 +16,18 @@
 depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
  'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
-makedepends=('git' 'nasm' 'mesa' 'optipng')
+makedepends=('git' 'nasm' 'mesa')
 options=('!libtool')
 
source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
 'v4l1_removal.patch'
+'ffmpeg_api.patch'
 'ffmpeg2.0.patch'
-'cinelerra-std_and_str_h.patch'
-'ffmpeg_api.patch')
+'cinelerra-std_and_str_h.patch')
 md5sums=('SKIP'
  'bfa85e20809429d88eba4ab83e569612'
- '02d8222e596133bbc05eaad15bef242c'
- 'b05ec2fb54e7d02f6167525417802111')
+ 'b05ec2fb54e7d02f6167525417802111'
+ '14dd897084d64cd0b5e9caa8a69818bd'
+ '02d8222e596133bbc05eaad15bef242c')
 
 _confit() {
   ./configure --prefix=/usr \
@@ -39,37 +40,44 @@
 prepare() {
   cd $srcdir/$pkgname
 
+  ## Patches (oldest first) ##
+
   # v4l1 removal patch
   patch -Np1 -i $srcdir/v4l1_removal.patch
 
+  # ffmpeg api patch update for 0.11
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # fix some missing headers
   patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
 
-  # new ffmpeg api patch
-  patch -Np1 -i $srcdir/ffmpeg_api.patch
-
-  # fix avcodec_alloc_context and alloc_open 
+  # fix avcodec_alloc_context and alloc_open
   patch -Np1 -i $srcdir/ffmpeg2.0.patch
 
-  # TODO: check if this is still needed (not sure what it does) --schiv
-  sed -i -e '/Debian/d' admin/nasm
+  ## Hacks ##
 
   # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
-  # TODO: kind of forgot about the specifics of this one, recheck --schiv
+  # TODO: check if this is still needed (pre-svn commit) --schiv
   sed -i '/\/X11R6/s///' configure.in
 
+  # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
   # fix some pngs that break with newer libpng
   # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
-#  msg2 Fixing PNGs, please wait...
-#find -name '*.png' -exec optipng -quiet -force -fix {} +
+  #msg2 Fixing PNGs, please wait...
+  #find -name '*.png' -exec optipng -quiet -force -fix {} +
 
-  #  FFmpeg 2.0 related replacements
-  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \; 
-  find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \; 
+  # ffmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \;
+  find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \;
 }
 
 build() {
   cd $srcdir/$pkgname
 
+  ## More Hacks (must be in existing env) ##
+
   # gcc 4.6 workaround
   export CFLAGS+= -Wwrite-strings -D__STDC_CONSTANT_MACROS
   export CPPFLAGS=$CFLAGS
@@ -79,7 +87,7 @@
 
   ./autogen.sh
 
-  # TODO: check if this is still needed (forgot why at all) --schiv
+  # TODO: check if this is still needed (pre-svn commit) --schiv
   if [ $CARCH = 'x86_64' ]; then
 _confit --disable-mmx
   else
@@ -96,8 +104,3 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('SKIP'
- 'bfa85e20809429d88eba4ab83e569612'
- '8d003f144b1c5e1cbbf13791fabb67cc'
- '02d8222e596133bbc05eaad15bef242c'
- 'b05ec2fb54e7d02f6167525417802111')

Modified: ffmpeg2.0.patch
===
--- ffmpeg2.0.patch 2013-09-15 19:11:31 UTC (rev 97244)
+++ ffmpeg2.0.patch 2013-09-15 19:52:15 UTC (rev 97245)
@@ -75,7 +75,7 @@
}
 -  if(avcodec_open(context, 
 -  ptr-decoder[i])  0)
-+  if(avcodec_open2(context,(ptr-decoder[i])  0,NULL))
++  if(avcodec_open2(context, ptr-decoder[i], NULL)  0)
{
printf(quicktime_new_ffmpeg: avcodec_open failed.\n);
quicktime_delete_ffmpeg(ptr);

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD ffmpeg2.0.patch)

[Jelle van der Waa]

Date: Monday, July 22, 2013 @ 21:49:48
  Author: jelle
Revision: 94408

upgpkg: cinelerra-cv 1:2.2-17

ffmpeg 2.0 rebuild

Added:
  cinelerra-cv/trunk/ffmpeg2.0.patch
Modified:
  cinelerra-cv/trunk/PKGBUILD

-+
 PKGBUILD|   19 --
 ffmpeg2.0.patch |   98 ++
 2 files changed, 114 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-22 19:23:28 UTC (rev 94407)
+++ PKGBUILD2013-07-22 19:49:48 UTC (rev 94408)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=16
+pkgrel=17
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')
@@ -20,6 +20,7 @@
 options=('!libtool')
 
source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
 'v4l1_removal.patch'
+'ffmpeg2.0.patch'
 'cinelerra-std_and_str_h.patch'
 'ffmpeg_api.patch')
 md5sums=('SKIP'
@@ -46,6 +47,9 @@
   # new ffmpeg api patch
   patch -Np1 -i $srcdir/ffmpeg_api.patch
 
+  # fix avcodec_alloc_context and alloc_open 
+  patch -Np1 -i $srcdir/ffmpeg2.0.patch
+
   # TODO: check if this is still needed (not sure what it does) --schiv
   sed -i -e '/Debian/d' admin/nasm
 
@@ -55,8 +59,12 @@
 
   # fix some pngs that break with newer libpng
   # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
-  msg2 Fixing PNGs, please wait...
-  find -name '*.png' -exec optipng -quiet -force -fix {} +
+#  msg2 Fixing PNGs, please wait...
+#find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+  #  FFmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \; 
+  find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \; 
 }
 
 build() {
@@ -88,3 +96,8 @@
 }
 
 # vim:set ts=2 sw=2 et:
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ '8d003f144b1c5e1cbbf13791fabb67cc'
+ '02d8222e596133bbc05eaad15bef242c'
+ 'b05ec2fb54e7d02f6167525417802111')

Added: ffmpeg2.0.patch
===
--- ffmpeg2.0.patch (rev 0)
+++ ffmpeg2.0.patch 2013-07-22 19:49:48 UTC (rev 94408)
@@ -0,0 +1,98 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index 6ab6047..f1cd308 100644
+--- a/cinelerra/ffmpeg.C
 b/cinelerra/ffmpeg.C
+@@ -33,9 +33,9 @@ int FFMPEG::init(char *codec_string) {
+   return 1;
+   }
+ 
+-  context = avcodec_alloc_context();
++  context = avcodec_alloc_context3(codec);
+ 
+-  if (avcodec_open(context, codec)) {
++  if (avcodec_open2(context, codec,NULL)) {
+   printf(FFMPEG::init avcodec_open() failed\n);
+   }
+ 
+diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C
+index a1ef61e..383f377 100644
+--- a/cinelerra/fileac3.C
 b/cinelerra/fileac3.C
+@@ -92,11 +92,11 @@ int FileAC3::open_file(int rd, int wr)
+   eprintf(codec not found.\n);
+   return 1;
+   }
+-  codec_context = avcodec_alloc_context();
++  codec_context = avcodec_alloc_context3(codec);
+   codec_context-bit_rate = asset-ac3_bitrate * 1000;
+   codec_context-sample_rate = asset-sample_rate;
+   codec_context-channels = asset-channels;
+-  if(avcodec_open(codec_context, codec))
++  if(avcodec_open2(codec_context, codec,NULL))
+   {
+   eprintf(failed to open codec.\n);
+   return 1;
+diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c
+index 81cb72b..02c4a92 100644
+--- a/quicktime/mpeg4.c
 b/quicktime/mpeg4.c
+@@ -641,7 +641,7 @@ static int encode(quicktime_t *file, unsigned char 
**row_pointers, int track)
+   return 1;
+   }
+ 
+-  codec-encoder_context[current_field] = 
avcodec_alloc_context();
++  codec-encoder_context[current_field] = 
avcodec_alloc_context3(codec-encoder[current_field]);
+   AVCodecContext *context = 
codec-encoder_context[current_field];
+ 
+   context-width = width_i;
+@@ -740,7 +740,7 @@ static int encode(quicktime_t *file, unsigned char 
**row_pointers, int track)
+  * codec-fix_bitrate,
+  * codec-quantizer);
+  */
+-  avcodec_open(context, codec-encoder[current_field]);
++  avcodec_open2(context, 
codec-encoder[current_field],NULL);
+ 
+   
avcodec_get_frame_defaults(codec-picture[current_field]);
+ 
+diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
+index 8c532c2..4f0bacb 100644
+--- a/quicktime/qtffmpeg.c
 b/quicktime/qtffmpeg.c
+@@ -68,7 +68,9 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
+   return 0;
+   }

[arch-commits] Commit in cinelerra-cv/repos (12 files)

[Jelle van der Waa]

Date: Monday, July 22, 2013 @ 21:51:03
  Author: jelle
Revision: 94409

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 94408, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch
(from rev 94408, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg2.0.patch
(from rev 94408, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 94408, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 94408, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 94408, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 94408, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg2.0.patch
(from rev 94408, cinelerra-cv/trunk/ffmpeg2.0.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 94408, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 94408, cinelerra-cv/trunk/v4l1_removal.patch)

+
 community-staging-i686/PKGBUILD|  103 +
 community-staging-i686/cinelerra-std_and_str_h.patch   |   81 +++
 community-staging-i686/ffmpeg2.0.patch |   98 +
 community-staging-i686/ffmpeg_api.patch|  163 +++
 community-staging-i686/v4l1_removal.patch  |  125 +++
 community-staging-x86_64/PKGBUILD  |  103 +
 community-staging-x86_64/cinelerra-std_and_str_h.patch |   81 +++
 community-staging-x86_64/ffmpeg2.0.patch   |   98 +
 community-staging-x86_64/ffmpeg_api.patch  |  163 +++
 community-staging-x86_64/v4l1_removal.patch|  125 +++
 10 files changed, 1140 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 94408, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-07-22 19:51:03 UTC (rev 94409)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=17
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa' 'optipng')
+options=('!libtool')
+source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg2.0.patch'
+'cinelerra-std_and_str_h.patch'
+'ffmpeg_api.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ '02d8222e596133bbc05eaad15bef242c'
+ 'b05ec2fb54e7d02f6167525417802111')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
+  # new ffmpeg api patch
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # fix avcodec_alloc_context and alloc_open 
+  patch -Np1 -i $srcdir/ffmpeg2.0.patch
+
+  # TODO: check if this is still needed (not sure what it does) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: kind of forgot about the specifics of this one, recheck --schiv
+  sed -i '/\/X11R6/s///' configure.in
+
+  # fix some pngs that break with newer libpng
+  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
+#  msg2 Fixing PNGs, please wait...
+#find -name '*.png' -exec optipng -quiet -force -fix {} +
+
+  #  FFmpeg 2.0 related replacements
+  find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \; 
+  find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \; 
+}
+
+build() {
+  cd $srcdir/$pkgname
+
+  # gcc 4.6 workaround
+  export 

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Ray Rashif]

Date: Sunday, May 5, 2013 @ 15:11:07
  Author: schiv
Revision: 89900

upgpkg: cinelerra-cv 1:2.2-16

fixed invalid PNGs for libpng 1.6

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-05 12:20:12 UTC (rev 89899)
+++ PKGBUILD2013-05-05 13:11:07 UTC (rev 89900)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=15
+pkgrel=16
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')
@@ -16,7 +16,7 @@
 depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
  'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
-makedepends=('git' 'nasm' 'mesa')
+makedepends=('git' 'nasm' 'mesa' 'optipng')
 options=('!libtool')
 
source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
 'v4l1_removal.patch'
@@ -52,6 +52,11 @@
   # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
   # TODO: kind of forgot about the specifics of this one, recheck --schiv
   sed -i '/\/X11R6/s///' configure.in
+
+  # fix some pngs that break with newer libpng
+  # see 
https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html
+  msg2 Fixing PNGs, please wait...
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
 }
 
 build() {

[arch-commits] Commit in cinelerra-cv/repos (16 files)

[Ray Rashif]

Date: Sunday, May 5, 2013 @ 15:11:28
  Author: schiv
Revision: 89901

archrelease: copy trunk to community-testing-x86_64, community-testing-i686

Added:
  cinelerra-cv/repos/community-testing-i686/PKGBUILD
(from rev 89900, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-testing-i686/cinelerra-std_and_str_h.patch
(from rev 89900, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-testing-i686/ffmpeg_api.patch
(from rev 89900, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-testing-i686/v4l1_removal.patch
(from rev 89900, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-testing-x86_64/PKGBUILD
(from rev 89900, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-testing-x86_64/cinelerra-std_and_str_h.patch
(from rev 89900, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-testing-x86_64/ffmpeg_api.patch
(from rev 89900, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-testing-x86_64/v4l1_removal.patch
(from rev 89900, cinelerra-cv/trunk/v4l1_removal.patch)
Deleted:
  cinelerra-cv/repos/community-testing-i686/PKGBUILD
  cinelerra-cv/repos/community-testing-i686/cinelerra-std_and_str_h.patch
  cinelerra-cv/repos/community-testing-i686/ffmpeg_api.patch
  cinelerra-cv/repos/community-testing-i686/v4l1_removal.patch
  cinelerra-cv/repos/community-testing-x86_64/PKGBUILD
  cinelerra-cv/repos/community-testing-x86_64/cinelerra-std_and_str_h.patch
  cinelerra-cv/repos/community-testing-x86_64/ffmpeg_api.patch
  cinelerra-cv/repos/community-testing-x86_64/v4l1_removal.patch

+
 /PKGBUILD  |  180 
 /cinelerra-std_and_str_h.patch |  162 +++
 /ffmpeg_api.patch  |  326 +++
 /v4l1_removal.patch|  250 +++
 community-testing-i686/PKGBUILD|   85 ---
 community-testing-i686/cinelerra-std_and_str_h.patch   |   81 ---
 community-testing-i686/ffmpeg_api.patch|  163 ---
 community-testing-i686/v4l1_removal.patch  |  125 -
 community-testing-x86_64/PKGBUILD  |   85 ---
 community-testing-x86_64/cinelerra-std_and_str_h.patch |   81 ---
 community-testing-x86_64/ffmpeg_api.patch  |  163 ---
 community-testing-x86_64/v4l1_removal.patch|  125 -
 12 files changed, 918 insertions(+), 908 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 89900:89901 to see the changes.

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD cinelerra-std_and_str_h.patch)

[Evangelos Foutras]

Date: Tuesday, April 30, 2013 @ 17:36:41
  Author: foutrelis
Revision: 89628

upgpkg: cinelerra-cv 1:2.2-15

libpng 1.6 rebuild.

Added:
  cinelerra-cv/trunk/cinelerra-std_and_str_h.patch
Modified:
  cinelerra-cv/trunk/PKGBUILD

---+
 PKGBUILD  |6 ++
 cinelerra-std_and_str_h.patch |   81 
 2 files changed, 86 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-30 15:00:40 UTC (rev 89627)
+++ PKGBUILD2013-04-30 15:36:41 UTC (rev 89628)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=14
+pkgrel=15
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')
@@ -20,9 +20,11 @@
 options=('!libtool')
 
source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
 'v4l1_removal.patch'
+'cinelerra-std_and_str_h.patch'
 'ffmpeg_api.patch')
 md5sums=('SKIP'
  'bfa85e20809429d88eba4ab83e569612'
+ '02d8222e596133bbc05eaad15bef242c'
  'b05ec2fb54e7d02f6167525417802111')
 
 _confit() {
@@ -39,6 +41,8 @@
   # v4l1 removal patch
   patch -Np1 -i $srcdir/v4l1_removal.patch
 
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
   # new ffmpeg api patch
   patch -Np1 -i $srcdir/ffmpeg_api.patch
 

Added: cinelerra-std_and_str_h.patch
===
--- cinelerra-std_and_str_h.patch   (rev 0)
+++ cinelerra-std_and_str_h.patch   2013-04-30 15:36:41 UTC (rev 89628)
@@ -0,0 +1,81 @@
+Include required headers for free(), memcpy(), strcpy(), bcopy(), and more
+Thanks to Martin von Gagern for reporting and initial patch
+See, http://bugs.gentoo.org/show_bug.cgi?id=465478
+
+--- cinelerra/vdevicebuz.C
 cinelerra/vdevicebuz.C
+@@ -49,6 +49,8 @@
+ #include sys/ioctl.h
+ #include sys/mman.h
+ #include unistd.h
++#include string.h
++#include strings.h
+ 
+ #define BASE_VIDIOCPRIVATE192 
+ 
+--- cinelerra/videodevice.C
 cinelerra/videodevice.C
+@@ -53,6 +53,7 @@
+ 
+ #include unistd.h
+ #include fcntl.h
++#include string.h
+ 
+ KeepaliveThread::KeepaliveThread(VideoDevice *device)
+  : Thread()
+--- libmpeg3/audio/ac3.c
 libmpeg3/audio/ac3.c
+@@ -1,3 +1,4 @@
++#include stdlib.h
+ #include stdint.h
+ #include stdio.h
+ 
+--- libmpeg3/audio/layer3.c
 libmpeg3/audio/layer3.c
+@@ -4,6 +4,7 @@
+ #include tables.h
+ 
+ #include stdio.h
++#include stdlib.h
+ #include string.h
+ 
+ struct gr_info_s 
+--- mplexlo/mplex.c
 mplexlo/mplex.c
+@@ -1,6 +1,6 @@
+ #include stdio.h
+ #include stdlib.h
+-
++#include string.h
+ 
+ #include libmpeg3.h
+ #include mpeg3protos.h
+--- quicktime/graphics.c
 quicktime/graphics.c
+@@ -1,5 +1,6 @@
+ #include graphics.h
+ 
++#include stdlib.h
+ #include string.h
+ 
+ /* Graphics acceleration routines */
+--- quicktime/libmjpeg.c
 quicktime/libmjpeg.c
+@@ -17,6 +17,7 @@
+  
+ #include stdio.h
+ #include stdlib.h
++#include string.h
+ #include colormodels.h
+ #include libmjpeg.h
+ 
+--- quicktime/qtpng.c
 quicktime/qtpng.c
+@@ -1,6 +1,7 @@
+ #include colormodels.h
+ #include funcprotos.h
+ #include png.h
++#include string.h
+ #include quicktime.h
+ #include qtpng.h
+ 

[arch-commits] Commit in cinelerra-cv/repos (10 files)

[Evangelos Foutras]

Date: Tuesday, April 30, 2013 @ 17:37:06
  Author: foutrelis
Revision: 89629

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 89628, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch
(from rev 89628, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 89628, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 89628, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 89628, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/cinelerra-std_and_str_h.patch
(from rev 89628, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 89628, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 89628, cinelerra-cv/trunk/v4l1_removal.patch)

+
 community-staging-i686/PKGBUILD|   85 +++
 community-staging-i686/cinelerra-std_and_str_h.patch   |   81 +++
 community-staging-i686/ffmpeg_api.patch|  163 +++
 community-staging-i686/v4l1_removal.patch  |  125 +++
 community-staging-x86_64/PKGBUILD  |   85 +++
 community-staging-x86_64/cinelerra-std_and_str_h.patch |   81 +++
 community-staging-x86_64/ffmpeg_api.patch  |  163 +++
 community-staging-x86_64/v4l1_removal.patch|  125 +++
 8 files changed, 908 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 89628, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-04-30 15:37:06 UTC (rev 89629)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=15
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+options=('!libtool')
+source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'cinelerra-std_and_str_h.patch'
+'ffmpeg_api.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ '02d8222e596133bbc05eaad15bef242c'
+ 'b05ec2fb54e7d02f6167525417802111')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  patch -Np0 -i $srcdir/cinelerra-std_and_str_h.patch
+
+  # new ffmpeg api patch
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # TODO: check if this is still needed (not sure what it does) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: kind of forgot about the specifics of this one, recheck --schiv
+  sed -i '/\/X11R6/s///' configure.in
+}
+
+build() {
+  cd $srcdir/$pkgname
+
+  # gcc 4.6 workaround
+  export CFLAGS+= -Wwrite-strings -D__STDC_CONSTANT_MACROS
+  export CPPFLAGS=$CFLAGS
+
+  # remove executable stack
+  export LDFLAGS+= -Wl,-z,noexecstack
+
+  ./autogen.sh
+
+  # TODO: check if this is still needed (forgot why at all) --schiv
+  if [ $CARCH = 'x86_64' ]; then
+_confit --disable-mmx
+  else
+_confit --enable-mmx
+  fi
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname
+
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: cinelerra-cv/repos/community-staging-i686/cinelerra-std_and_str_h.patch 
(from rev 89628, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch)
===
--- community-staging-i686/cinelerra-std_and_str_h.patch
(rev 0)
+++ community-staging-i686/cinelerra-std_and_str_h.patch2013-04-30 
15:37:06 UTC (rev 89629)
@@ -0,0 +1,81 @@
+Include required headers for 

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Ray Rashif]

Date: Wednesday, April 17, 2013 @ 23:56:52
  Author: schiv
Revision: 88444

upgpkg: cinelerra-cv 1:2.2-14

openexr/ilmbase rebuild
also updated PKGBUILD to new VCS scheme

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |   56 
 1 file changed, 24 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-17 18:45:36 UTC (rev 88443)
+++ PKGBUILD2013-04-17 21:56:52 UTC (rev 88444)
@@ -7,25 +7,24 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=13
+pkgrel=14
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')
 url=http://cinelerra.org/;
 license=('GPL')
-depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'freetype2'
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
  'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
- 'ffmpeg' 'libxv' 'faad2' 'faac' 'openexr' 'ilmbase=1.0.3')
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
 makedepends=('git' 'nasm' 'mesa')
 options=('!libtool')
-source=('v4l1_removal.patch'
+source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
 'ffmpeg_api.patch')
-md5sums=('bfa85e20809429d88eba4ab83e569612'
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
  'b05ec2fb54e7d02f6167525417802111')
 
-_gituri=git://git.cinelerra.org/CinelerraCV.git
-_gitdir=cinelerra
-
 _confit() {
   ./configure --prefix=/usr \
   --with-buildinfo=git/recompile \
@@ -34,43 +33,36 @@
   --disable-esd $@
 }
 
-build() {
-  msg Connecting to GIT server
+prepare() {
+  cd $srcdir/$pkgname
 
-  if [ -d $_gitdir ] ; then
-cd $_gitdir  git pull origin
-msg The local files are updated.
-  else
-git clone $_gituri -b rel$_gitrel $_gitdir
-  fi
-
-  msg GIT checkout done or server timeout
-  msg Starting make...
-
-  rm -rf $srcdir/$_gitdir-build
-  cp -r $srcdir/$_gitdir $srcdir/$_gitdir-build
-  cd $srcdir/$_gitdir-build
-
-  # gcc 4.6 workaround
-  export CFLAGS+= -Wwrite-strings -D__STDC_CONSTANT_MACROS
-  export CPPFLAGS=$CFLAGS
-
-  # remove executable stack
-  export LDFLAGS+= -Wl,-z,noexecstack
-
   # v4l1 removal patch
   patch -Np1 -i $srcdir/v4l1_removal.patch
 
   # new ffmpeg api patch
   patch -Np1 -i $srcdir/ffmpeg_api.patch
 
+  # TODO: check if this is still needed (not sure what it does) --schiv
   sed -i -e '/Debian/d' admin/nasm
 
   # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: kind of forgot about the specifics of this one, recheck --schiv
   sed -i '/\/X11R6/s///' configure.in
+}
 
+build() {
+  cd $srcdir/$pkgname
+
+  # gcc 4.6 workaround
+  export CFLAGS+= -Wwrite-strings -D__STDC_CONSTANT_MACROS
+  export CPPFLAGS=$CFLAGS
+
+  # remove executable stack
+  export LDFLAGS+= -Wl,-z,noexecstack
+
   ./autogen.sh
 
+  # TODO: check if this is still needed (forgot why at all) --schiv
   if [ $CARCH = 'x86_64' ]; then
 _confit --disable-mmx
   else
@@ -81,7 +73,7 @@
 }
 
 package() {
-  cd $srcdir/$_gitdir-build
+  cd $srcdir/$pkgname
 
   make DESTDIR=$pkgdir install
 }

[arch-commits] Commit in cinelerra-cv/repos (8 files)

[Ray Rashif]

Date: Wednesday, April 17, 2013 @ 23:57:11
  Author: schiv
Revision: 88445

archrelease: copy trunk to community-testing-x86_64, community-testing-i686

Added:
  cinelerra-cv/repos/community-testing-i686/
  cinelerra-cv/repos/community-testing-i686/PKGBUILD
(from rev 88444, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-testing-i686/ffmpeg_api.patch
(from rev 88444, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-testing-i686/v4l1_removal.patch
(from rev 88444, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-testing-x86_64/
  cinelerra-cv/repos/community-testing-x86_64/PKGBUILD
(from rev 88444, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-testing-x86_64/ffmpeg_api.patch
(from rev 88444, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-testing-x86_64/v4l1_removal.patch
(from rev 88444, cinelerra-cv/trunk/v4l1_removal.patch)

-+
 community-testing-i686/PKGBUILD |   81 
 community-testing-i686/ffmpeg_api.patch |  163 ++
 community-testing-i686/v4l1_removal.patch   |  125 +++
 community-testing-x86_64/PKGBUILD   |   81 
 community-testing-x86_64/ffmpeg_api.patch   |  163 ++
 community-testing-x86_64/v4l1_removal.patch |  125 +++
 6 files changed, 738 insertions(+)

Copied: cinelerra-cv/repos/community-testing-i686/PKGBUILD (from rev 88444, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2013-04-17 21:57:11 UTC (rev 88445)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=14
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'faad2' 'faac' 'openexr=2.0.0')
+makedepends=('git' 'nasm' 'mesa')
+options=('!libtool')
+source=($pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel
+'v4l1_removal.patch'
+'ffmpeg_api.patch')
+md5sums=('SKIP'
+ 'bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111')
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+prepare() {
+  cd $srcdir/$pkgname
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # new ffmpeg api patch
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  # TODO: check if this is still needed (not sure what it does) --schiv
+  sed -i -e '/Debian/d' admin/nasm
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: kind of forgot about the specifics of this one, recheck --schiv
+  sed -i '/\/X11R6/s///' configure.in
+}
+
+build() {
+  cd $srcdir/$pkgname
+
+  # gcc 4.6 workaround
+  export CFLAGS+= -Wwrite-strings -D__STDC_CONSTANT_MACROS
+  export CPPFLAGS=$CFLAGS
+
+  # remove executable stack
+  export LDFLAGS+= -Wl,-z,noexecstack
+
+  ./autogen.sh
+
+  # TODO: check if this is still needed (forgot why at all) --schiv
+  if [ $CARCH = 'x86_64' ]; then
+_confit --disable-mmx
+  else
+_confit --enable-mmx
+  fi
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname
+
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: cinelerra-cv/repos/community-testing-i686/ffmpeg_api.patch (from rev 
88444, cinelerra-cv/trunk/ffmpeg_api.patch)
===
--- community-testing-i686/ffmpeg_api.patch (rev 0)
+++ community-testing-i686/ffmpeg_api.patch 2013-04-17 21:57:11 UTC (rev 
88445)
@@ -0,0 +1,163 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index 6ab6047..7cde503 100644
+--- a/cinelerra/ffmpeg.C
 b/cinelerra/ffmpeg.C
+@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) {
+ 
+ int FFMPEG::init(char *codec_string) {
+ 
+-  avcodec_init();
+   avcodec_register_all();
+ 
+   CodecID id = codec_id(codec_string);
+@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame 
*frame_out) {
+ 
+   // NOTE: frame must already have data space allocated
+   
++  AVPacket pkt;
+   got_picture = 0;
+-  int length = avcodec_decode_video(context,
++  av_init_packet( pkt );
++  pkt.data = data;
++  pkt.size = data_size;
++  int 

[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

Date: Sunday, February 10, 2013 @ 11:48:16
  Author: bpiotrowski
Revision: 84082

upgpkg: cinelerra-cv 1:2.2-13

rebuild against ffmpeg 1.1

Modified:
  cinelerra-cv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-10 08:45:13 UTC (rev 84081)
+++ PKGBUILD2013-02-10 10:48:16 UTC (rev 84082)
@@ -7,7 +7,7 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=12
+pkgrel=13
 epoch=1
 pkgdesc=Professional video editing and compositing environment
 arch=('x86_64' 'i686')

[arch-commits] Commit in cinelerra-cv/repos (8 files)

[Bartłomiej Piotrowski]

Date: Sunday, February 10, 2013 @ 11:48:34
  Author: bpiotrowski
Revision: 84083

archrelease: copy trunk to community-staging-x86_64, community-staging-i686

Added:
  cinelerra-cv/repos/community-staging-i686/
  cinelerra-cv/repos/community-staging-i686/PKGBUILD
(from rev 84082, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch
(from rev 84082, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-i686/v4l1_removal.patch
(from rev 84082, cinelerra-cv/trunk/v4l1_removal.patch)
  cinelerra-cv/repos/community-staging-x86_64/
  cinelerra-cv/repos/community-staging-x86_64/PKGBUILD
(from rev 84082, cinelerra-cv/trunk/PKGBUILD)
  cinelerra-cv/repos/community-staging-x86_64/ffmpeg_api.patch
(from rev 84082, cinelerra-cv/trunk/ffmpeg_api.patch)
  cinelerra-cv/repos/community-staging-x86_64/v4l1_removal.patch
(from rev 84082, cinelerra-cv/trunk/v4l1_removal.patch)

-+
 community-staging-i686/PKGBUILD |   89 ++
 community-staging-i686/ffmpeg_api.patch |  163 ++
 community-staging-i686/v4l1_removal.patch   |  125 +++
 community-staging-x86_64/PKGBUILD   |   89 ++
 community-staging-x86_64/ffmpeg_api.patch   |  163 ++
 community-staging-x86_64/v4l1_removal.patch |  125 +++
 6 files changed, 754 insertions(+)

Copied: cinelerra-cv/repos/community-staging-i686/PKGBUILD (from rev 84082, 
cinelerra-cv/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-10 10:48:34 UTC (rev 84083)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Ray Rashif sc...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
+# Contributor: Alexander Rødseth rods...@gmail.com
+
+pkgname=cinelerra-cv
+pkgver=2.2
+_gitrel=2.2.0
+pkgrel=13
+epoch=1
+pkgdesc=Professional video editing and compositing environment
+arch=('x86_64' 'i686')
+url=http://cinelerra.org/;
+license=('GPL')
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'freetype2'
+ 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
+ 'ffmpeg' 'libxv' 'faad2' 'faac' 'openexr' 'ilmbase=1.0.3')
+makedepends=('git' 'nasm' 'mesa')
+options=('!libtool')
+source=('v4l1_removal.patch'
+'ffmpeg_api.patch')
+md5sums=('bfa85e20809429d88eba4ab83e569612'
+ 'b05ec2fb54e7d02f6167525417802111')
+
+_gituri=git://git.cinelerra.org/CinelerraCV.git
+_gitdir=cinelerra
+
+_confit() {
+  ./configure --prefix=/usr \
+  --with-buildinfo=git/recompile \
+  --with-external-ffmpeg \
+  --enable-opengl \
+  --disable-esd $@
+}
+
+build() {
+  msg Connecting to GIT server
+
+  if [ -d $_gitdir ] ; then
+cd $_gitdir  git pull origin
+msg The local files are updated.
+  else
+git clone $_gituri -b rel$_gitrel $_gitdir
+  fi
+
+  msg GIT checkout done or server timeout
+  msg Starting make...
+
+  rm -rf $srcdir/$_gitdir-build
+  cp -r $srcdir/$_gitdir $srcdir/$_gitdir-build
+  cd $srcdir/$_gitdir-build
+
+  # gcc 4.6 workaround
+  export CFLAGS+= -Wwrite-strings -D__STDC_CONSTANT_MACROS
+  export CPPFLAGS=$CFLAGS
+
+  # remove executable stack
+  export LDFLAGS+= -Wl,-z,noexecstack
+
+  # v4l1 removal patch
+  patch -Np1 -i $srcdir/v4l1_removal.patch
+
+  # new ffmpeg api patch
+  patch -Np1 -i $srcdir/ffmpeg_api.patch
+
+  sed -i -e '/Debian/d' admin/nasm
+
+  # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  sed -i '/\/X11R6/s///' configure.in
+
+  ./autogen.sh
+
+  if [ $CARCH = 'x86_64' ]; then
+_confit --disable-mmx
+  else
+_confit --enable-mmx
+  fi
+
+  make
+}
+
+package() {
+  cd $srcdir/$_gitdir-build
+
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: cinelerra-cv/repos/community-staging-i686/ffmpeg_api.patch (from rev 
84082, cinelerra-cv/trunk/ffmpeg_api.patch)
===
--- community-staging-i686/ffmpeg_api.patch (rev 0)
+++ community-staging-i686/ffmpeg_api.patch 2013-02-10 10:48:34 UTC (rev 
84083)
@@ -0,0 +1,163 @@
+diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
+index 6ab6047..7cde503 100644
+--- a/cinelerra/ffmpeg.C
 b/cinelerra/ffmpeg.C
+@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) {
+ 
+ int FFMPEG::init(char *codec_string) {
+ 
+-  avcodec_init();
+   avcodec_register_all();
+ 
+   CodecID id = codec_id(codec_string);
+@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame 
*frame_out) {
+ 
+   // NOTE: frame must already have data space allocated
+   
++  AVPacket pkt;
+   got_picture = 0;
+-  int length =