From: Good Guy Date: Thu, 9 Jun 2016 00:30:45 +0000 (-0600) Subject: add packaging X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=d15e0002dd6aa24de8e899b3551d247ac2128811;p=goodguy%2Fhistory.git add packaging --- diff --git a/cinelerra-5.1/bld_scripts/debpkg.sh b/cinelerra-5.1/bld_scripts/debpkg.sh new file mode 100755 index 00000000..4c821b04 --- /dev/null +++ b/cinelerra-5.1/bld_scripts/debpkg.sh @@ -0,0 +1,4 @@ +#!/bin/bash -x + +./debian/rules binary + diff --git a/cinelerra-5.1/bld_scripts/rpmsrc.sh b/cinelerra-5.1/bld_scripts/rpmsrc.sh new file mode 100755 index 00000000..5a2bd8fa --- /dev/null +++ b/cinelerra-5.1/bld_scripts/rpmsrc.sh @@ -0,0 +1,5 @@ +#!/bin/bash -x + +rpmbuild --define "_srcrpmdir `cd ..; pwd`" \ + -bs --build-in-place cinelerra.spec + diff --git a/cinelerra-5.1/cinelerra.spec b/cinelerra-5.1/cinelerra.spec new file mode 100644 index 00000000..0dce39b3 --- /dev/null +++ b/cinelerra-5.1/cinelerra.spec @@ -0,0 +1,83 @@ +%define ver 20160606 +Summary: Multimedia Editing and construction +Name: cinelerra +Version: 5.1 +Release: %{ver} +License: GPL +Group: Applications/Multimedia +URL: http://cinelerra-cv.org/ + +# Obtained from : +# git clone git://git.cinelerra.org/goodguy/cinelerra.git cinelerra5 +Source0: cinelerra-%{version}-%{ver}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +%if 0%{?fedora}%{?centos} +%define rhat 1 +%endif + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: cmake +BuildRequires: binutils +BuildRequires: ctags +BuildRequires: flac-devel +BuildRequires: freetype-devel +BuildRequires: gcc-c++ +BuildRequires: gettext-devel +BuildRequires: git +BuildRequires: inkscape +BuildRequires: libpng-devel +BuildRequires: libXft-devel +BuildRequires: libXinerama-devel +BuildRequires: libXv-devel +BuildRequires: nasm +BuildRequires: ncurses-devel +BuildRequires: texinfo +BuildRequires: udftools +%{?rhat:BuildRequires: alsa-lib-devel} +%{?rhat:BuildRequires: bzip2-devel} +%{?rhat:BuildRequires: xorg-x11-fonts-cyrillic} +%{?rhat:BuildRequires: xorg-x11-fonts-cyrillic} +%{?rhat:BuildRequires: xorg-x11-fonts-ISO8859-1-100dpi} +%{?rhat:BuildRequires: xorg-x11-fonts-ISO8859-1-75dpi} +%{?rhat:BuildRequires: xorg-x11-fonts-misc} +%{?rhat:BuildRequires: xorg-x11-fonts-Type1} +%{?suse:BuildRequires: alsa-devel} +%{?suse:BuildRequires: libbz2-devel} +%{?suse:BuildRequires: bitstream-vera-fonts} +%{?suse:BuildRequires: xorg-x11-fonts-core} +%{?suse:BuildRequires: xorg-x11-fonts} +%{?suse:BuildRequires: dejavu-fonts} +%{?suse:BuildRequires: libnuma-devel} +BuildRequires: xz-devel +BuildRequires: yasm +BuildRequires: zlib-devel + +%description +Multimedia editing and construction + +%prep +%setup +%build +./autogen.sh +%configure +%{__make} + +%install +%make_install + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-, root, root, -) +%{_bindir}/* +%{_libdir}/* +%{_datadir}/* + +%exclude /usr/src/debug +%exclude /usr/lib/debug + +%changelog + diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index f9eccff4..62579719 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -582,6 +582,21 @@ AC_DEFUN([PKG_STATIC],[ ]) AC_DEFUN([PKG_FORCED],[PKG_STATIC([$1],[forced])]) +# order matters +for dep in \ + ffmpeg/faac ffmpeg/faad2 ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \ + ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/fdk \ + libiec61883/libraw1394 libavc1394/librom1394 \ + openexr/ilmbase ilmbase/libogg \ + libtheora/libogg libtheora/libvorbis ; do + lib=`dirname $dep` + eval pkg_lib="\$PKG_$lib"; eval have_lib="\$HAVE_$lib"; + if test "x$pkg_lib" != "xno" ; then + needs=`basename $dep` + eval "PKG_$needs=yes" + fi +done + AC_DEFUN([PKG_PROVIDE],[ if test "x$BUILD_$1" = "x" ; then if test "x$2" = "xno" -o "x$PKG_$1" = "xno"; then diff --git a/cinelerra-5.1/debian/changelog b/cinelerra-5.1/debian/changelog new file mode 100644 index 00000000..08b9df6d --- /dev/null +++ b/cinelerra-5.1/debian/changelog @@ -0,0 +1,6 @@ +cin (1:5.1.20160606) unstable; urgency=low + + [ guy goode ] + + -- lists Mon, 6 Jun 2016 18:39:04 +0700 + diff --git a/cinelerra-5.1/debian/cin.postinst b/cinelerra-5.1/debian/cin.postinst new file mode 100644 index 00000000..621b186f --- /dev/null +++ b/cinelerra-5.1/debian/cin.postinst @@ -0,0 +1,4 @@ +#!/bin/bash -e +exec > /dev/null 2>&1 +if [ ! /proc/self/root -ef /proc/1/root ]; then exit; fi +sysctl -p /etc/sysctl.d/50-cin.conf diff --git a/cinelerra-5.1/debian/compat b/cinelerra-5.1/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/cinelerra-5.1/debian/compat @@ -0,0 +1 @@ +9 diff --git a/cinelerra-5.1/debian/control b/cinelerra-5.1/debian/control new file mode 100644 index 00000000..fdbc5b12 --- /dev/null +++ b/cinelerra-5.1/debian/control @@ -0,0 +1,21 @@ +Source: cin +Section: video +Priority: optional +Standards-Version: 5.1.20160606 +Maintainer: mailing list +Homepage: http://www.cinelerra-cv.org/ +Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs, + libz-dev, liblzma-dev, libbz2-dev, exuberant-ctags, + libxft-dev, libxinerama-dev, libxv-dev, linux-firmware, + freeglut3-dev, libxv-dev, libasound2-dev, + libncurses5-dev, libxinerama-dev, libfreetype6-dev, libxft-dev, + ttf-bitstream-vera, xfonts-75dpi, xfonts-100dpi, fonts-dejavu, + libflac-dev, inkscape, texinfo, libpng-dev, + cmake, udftools, libxml2-utils, git, gettext, + autoconf, automake + +Package: cin +Depends: ${misc:Depends} +Description: Multimedia editing and construction +Architecture: any + diff --git a/cinelerra-5.1/debian/copyright b/cinelerra-5.1/debian/copyright new file mode 100644 index 00000000..4396b192 --- /dev/null +++ b/cinelerra-5.1/debian/copyright @@ -0,0 +1,31 @@ +originally written by Heroine Virtual Ltd. +http://heroinewarrior.com/ + +This package is using sources obtained from: +http://cinelerra-cv.org. +git://git.cinelerra-cv.org/goodguy/cinelerra.git + +Copyright (c) 1996-2015 Heroine Virtual Ltd. +Copyright (c) 2006-2016 Cinelerra-CV community + +Cinelerra is released under GNU Public License v.2. + + All Rights Reserved + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + diff --git a/cinelerra-5.1/debian/rules b/cinelerra-5.1/debian/rules new file mode 100755 index 00000000..c95b0a03 --- /dev/null +++ b/cinelerra-5.1/debian/rules @@ -0,0 +1,49 @@ +#!/usr/bin/make -f +# from topdir ./debian/rules binary +package=cin + +# Enable hardening flags +CFLAGS += $(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) + +build build-arch build-indep: build-stamp + +build-stamp: + dh_testdir + @if [ ! -e configure ] ; then ./autogen.sh; fi + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \ + ./configure --enable-opengl --prefix=/usr $(CONFFLAGS) + $(MAKE) $(MAKEFLAGS) + touch $@ + +clean: + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) clean + dh_clean -a + -rm -f build-stamp + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/cin + install -D -m644 debian/sysctl.d debian/cin/etc/sysctl.d/50-cin.conf + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_install + dh_link -a + dh_icons -a + dh_fixperms -a + dh_installdeb -a + dh_gencontrol + dh_builddeb -p cin + +binary: binary-indep binary-arch + diff --git a/cinelerra-5.1/debian/sysctl.d b/cinelerra-5.1/debian/sysctl.d new file mode 100644 index 00000000..3ef3b1b5 --- /dev/null +++ b/cinelerra-5.1/debian/sysctl.d @@ -0,0 +1 @@ +kernel.shmmax = 0x7fffffff diff --git a/cinelerra-5.1/inst.sh b/cinelerra-5.1/inst.sh index f4d40587..bbfee547 100755 --- a/cinelerra-5.1/inst.sh +++ b/cinelerra-5.1/inst.sh @@ -4,10 +4,11 @@ cr=' ' dir="$1"; shift 1 $mkinstalldirs "$dir" +if [ "$*" = "*" ]; then exit; fi for f in "$@"; do if [ -f "$f" ]; then $install_sh -c "$f" "$dir"; continue; fi - if [ -d "$f" ]; then ( cd $f; IFS="$cr"; $inst_sh "$dir/$f" `ls -1` ) + if [ -d "$f" ]; then ( cd $f; $inst_sh "$dir/$f" * ) else echo "*** Error - install $f in $dir failed." 1>&2; exit 1; fi done diff --git a/cinelerra-5.1/mpeg2enc/mpeg2enc.c b/cinelerra-5.1/mpeg2enc/mpeg2enc.c index 19c1617a..794cb12e 100644 --- a/cinelerra-5.1/mpeg2enc/mpeg2enc.c +++ b/cinelerra-5.1/mpeg2enc/mpeg2enc.c @@ -338,8 +338,7 @@ static void init() void error(text) char *text; { - fprintf(stderr,text); - putc('\n',stderr); + fprintf(stderr,"%s\n",text); exit(1); }