From 4a894820c0dad2eef6a281f00988aea48696765b Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sat, 7 Jul 2018 12:32:14 -0600 Subject: [PATCH] move bld scripts to blds, add yuri GL bsd patch --- cinelerra-5.1/{ => blds}/PKGBUILD | 0 cinelerra-5.1/{ => blds}/arch.bld | 0 .../{bld_scripts => blds}/bld_dynamic.sh | 0 .../{bld_scripts => blds}/bld_package.sh | 0 .../{bld_scripts => blds}/bld_prepare.sh | 0 .../{bld_scripts => blds}/bld_static.sh | 0 cinelerra-5.1/{ => blds}/bsd.bld | 0 cinelerra-5.1/{ => blds}/bsd.patch | 17 +++++++++++++---- cinelerra-5.1/{ => blds}/cfg-cv.sh | 0 cinelerra-5.1/{ => blds}/cin.SlackBuild | 0 cinelerra-5.1/{ => blds}/cinelerra.spec | 0 cinelerra-5.1/{ => blds}/deb.bld | 0 cinelerra-5.1/{ => blds}/debian/changelog | 0 cinelerra-5.1/{ => blds}/debian/cin.postinst | 0 cinelerra-5.1/{ => blds}/debian/compat | 0 cinelerra-5.1/{ => blds}/debian/control | 0 cinelerra-5.1/{ => blds}/debian/copyright | 0 cinelerra-5.1/{ => blds}/debian/rules | 0 cinelerra-5.1/{ => blds}/debian/sysctl.d | 0 cinelerra-5.1/{bld_scripts => blds}/debpkg.sh | 0 cinelerra-5.1/{bld_scripts => blds}/pkgbld.sh | 0 cinelerra-5.1/{ => blds}/rpm.bld | 0 cinelerra-5.1/{bld_scripts => blds}/rpmsrc.sh | 0 cinelerra-5.1/cinelerra/videodevice.C | 2 +- 24 files changed, 14 insertions(+), 5 deletions(-) rename cinelerra-5.1/{ => blds}/PKGBUILD (100%) rename cinelerra-5.1/{ => blds}/arch.bld (100%) rename cinelerra-5.1/{bld_scripts => blds}/bld_dynamic.sh (100%) rename cinelerra-5.1/{bld_scripts => blds}/bld_package.sh (100%) rename cinelerra-5.1/{bld_scripts => blds}/bld_prepare.sh (100%) rename cinelerra-5.1/{bld_scripts => blds}/bld_static.sh (100%) rename cinelerra-5.1/{ => blds}/bsd.bld (100%) rename cinelerra-5.1/{ => blds}/bsd.patch (98%) rename cinelerra-5.1/{ => blds}/cfg-cv.sh (100%) rename cinelerra-5.1/{ => blds}/cin.SlackBuild (100%) rename cinelerra-5.1/{ => blds}/cinelerra.spec (100%) rename cinelerra-5.1/{ => blds}/deb.bld (100%) rename cinelerra-5.1/{ => blds}/debian/changelog (100%) rename cinelerra-5.1/{ => blds}/debian/cin.postinst (100%) rename cinelerra-5.1/{ => blds}/debian/compat (100%) rename cinelerra-5.1/{ => blds}/debian/control (100%) rename cinelerra-5.1/{ => blds}/debian/copyright (100%) rename cinelerra-5.1/{ => blds}/debian/rules (100%) rename cinelerra-5.1/{ => blds}/debian/sysctl.d (100%) rename cinelerra-5.1/{bld_scripts => blds}/debpkg.sh (100%) rename cinelerra-5.1/{bld_scripts => blds}/pkgbld.sh (100%) rename cinelerra-5.1/{ => blds}/rpm.bld (100%) rename cinelerra-5.1/{bld_scripts => blds}/rpmsrc.sh (100%) diff --git a/cinelerra-5.1/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD similarity index 100% rename from cinelerra-5.1/PKGBUILD rename to cinelerra-5.1/blds/PKGBUILD diff --git a/cinelerra-5.1/arch.bld b/cinelerra-5.1/blds/arch.bld similarity index 100% rename from cinelerra-5.1/arch.bld rename to cinelerra-5.1/blds/arch.bld diff --git a/cinelerra-5.1/bld_scripts/bld_dynamic.sh b/cinelerra-5.1/blds/bld_dynamic.sh similarity index 100% rename from cinelerra-5.1/bld_scripts/bld_dynamic.sh rename to cinelerra-5.1/blds/bld_dynamic.sh diff --git a/cinelerra-5.1/bld_scripts/bld_package.sh b/cinelerra-5.1/blds/bld_package.sh similarity index 100% rename from cinelerra-5.1/bld_scripts/bld_package.sh rename to cinelerra-5.1/blds/bld_package.sh diff --git a/cinelerra-5.1/bld_scripts/bld_prepare.sh b/cinelerra-5.1/blds/bld_prepare.sh similarity index 100% rename from cinelerra-5.1/bld_scripts/bld_prepare.sh rename to cinelerra-5.1/blds/bld_prepare.sh diff --git a/cinelerra-5.1/bld_scripts/bld_static.sh b/cinelerra-5.1/blds/bld_static.sh similarity index 100% rename from cinelerra-5.1/bld_scripts/bld_static.sh rename to cinelerra-5.1/blds/bld_static.sh diff --git a/cinelerra-5.1/bsd.bld b/cinelerra-5.1/blds/bsd.bld similarity index 100% rename from cinelerra-5.1/bsd.bld rename to cinelerra-5.1/blds/bsd.bld diff --git a/cinelerra-5.1/bsd.patch b/cinelerra-5.1/blds/bsd.patch similarity index 98% rename from cinelerra-5.1/bsd.patch rename to cinelerra-5.1/blds/bsd.patch index f6841bda..31d18ba6 100644 --- a/cinelerra-5.1/bsd.patch +++ b/cinelerra-5.1/blds/bsd.patch @@ -1,5 +1,5 @@ diff --git a/cinelerra-5.1/Makefile.devel b/cinelerra-5.1/Makefile.devel -index a12d8f2b..f892f648 100644 +index a12d8f2b..9aac014a 100644 --- a/cinelerra-5.1/Makefile.devel +++ b/cinelerra-5.1/Makefile.devel @@ -4,7 +4,7 @@ TOPDIR := $(CURDIR) @@ -12,7 +12,7 @@ index a12d8f2b..f892f648 100644 MAKEJ := $(MAKE) $(jobs) diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile -index 18590e3a..a60c71d1 100644 +index 18590e3a..5eead290 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -395,6 +395,7 @@ LIBS += -lfontconfig -lfreetype @@ -23,6 +23,15 @@ index 18590e3a..a60c71d1 100644 LIBS += $(if $(filter fftw,$(static_pkgs)), -lfftw3) LIBS += $(if $(filter flac,$(static_pkgs)), -lFLAC) +@@ -414,7 +415,7 @@ LIBS += $(if $(filter x265,$(static_pkgs)), -lx265) + LIBS += $(if $(filter libvpx,$(static_pkgs)), -lvpx) + + ifneq ($(WANT_GL),no) +-LIBS += -lGL -lGLU -lGLX ++LIBS += -lGL -lGLU + endif + ifneq ($(WANT_XFT),no) + LIBS += -lXft @@ -476,6 +477,7 @@ LV2OBJS = \ endif @@ -196,7 +205,7 @@ index 3d21d2af..f3064199 100644 // check for isofs volume_id for dvd/cdrom diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac -index 6fba32bb..ccdb683b 100644 +index 94f9b382..4c4bee11 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -16,15 +16,26 @@ CFG_CFLAGS+=" -Wno-unused-result" @@ -281,7 +290,7 @@ index 40f5971f..73d47586 100644 float* get_values(); diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C -index e3400600..b32d0a6f 100644 +index e3400600..f201028c 100644 --- a/cinelerra-5.1/guicast/bcresources.C +++ b/cinelerra-5.1/guicast/bcresources.C @@ -38,6 +38,7 @@ diff --git a/cinelerra-5.1/cfg-cv.sh b/cinelerra-5.1/blds/cfg-cv.sh similarity index 100% rename from cinelerra-5.1/cfg-cv.sh rename to cinelerra-5.1/blds/cfg-cv.sh diff --git a/cinelerra-5.1/cin.SlackBuild b/cinelerra-5.1/blds/cin.SlackBuild similarity index 100% rename from cinelerra-5.1/cin.SlackBuild rename to cinelerra-5.1/blds/cin.SlackBuild diff --git a/cinelerra-5.1/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec similarity index 100% rename from cinelerra-5.1/cinelerra.spec rename to cinelerra-5.1/blds/cinelerra.spec diff --git a/cinelerra-5.1/deb.bld b/cinelerra-5.1/blds/deb.bld similarity index 100% rename from cinelerra-5.1/deb.bld rename to cinelerra-5.1/blds/deb.bld diff --git a/cinelerra-5.1/debian/changelog b/cinelerra-5.1/blds/debian/changelog similarity index 100% rename from cinelerra-5.1/debian/changelog rename to cinelerra-5.1/blds/debian/changelog diff --git a/cinelerra-5.1/debian/cin.postinst b/cinelerra-5.1/blds/debian/cin.postinst similarity index 100% rename from cinelerra-5.1/debian/cin.postinst rename to cinelerra-5.1/blds/debian/cin.postinst diff --git a/cinelerra-5.1/debian/compat b/cinelerra-5.1/blds/debian/compat similarity index 100% rename from cinelerra-5.1/debian/compat rename to cinelerra-5.1/blds/debian/compat diff --git a/cinelerra-5.1/debian/control b/cinelerra-5.1/blds/debian/control similarity index 100% rename from cinelerra-5.1/debian/control rename to cinelerra-5.1/blds/debian/control diff --git a/cinelerra-5.1/debian/copyright b/cinelerra-5.1/blds/debian/copyright similarity index 100% rename from cinelerra-5.1/debian/copyright rename to cinelerra-5.1/blds/debian/copyright diff --git a/cinelerra-5.1/debian/rules b/cinelerra-5.1/blds/debian/rules similarity index 100% rename from cinelerra-5.1/debian/rules rename to cinelerra-5.1/blds/debian/rules diff --git a/cinelerra-5.1/debian/sysctl.d b/cinelerra-5.1/blds/debian/sysctl.d similarity index 100% rename from cinelerra-5.1/debian/sysctl.d rename to cinelerra-5.1/blds/debian/sysctl.d diff --git a/cinelerra-5.1/bld_scripts/debpkg.sh b/cinelerra-5.1/blds/debpkg.sh similarity index 100% rename from cinelerra-5.1/bld_scripts/debpkg.sh rename to cinelerra-5.1/blds/debpkg.sh diff --git a/cinelerra-5.1/bld_scripts/pkgbld.sh b/cinelerra-5.1/blds/pkgbld.sh similarity index 100% rename from cinelerra-5.1/bld_scripts/pkgbld.sh rename to cinelerra-5.1/blds/pkgbld.sh diff --git a/cinelerra-5.1/rpm.bld b/cinelerra-5.1/blds/rpm.bld similarity index 100% rename from cinelerra-5.1/rpm.bld rename to cinelerra-5.1/blds/rpm.bld diff --git a/cinelerra-5.1/bld_scripts/rpmsrc.sh b/cinelerra-5.1/blds/rpmsrc.sh similarity index 100% rename from cinelerra-5.1/bld_scripts/rpmsrc.sh rename to cinelerra-5.1/blds/rpmsrc.sh diff --git a/cinelerra-5.1/cinelerra/videodevice.C b/cinelerra-5.1/cinelerra/videodevice.C index 0a9c7799..78214ada 100644 --- a/cinelerra-5.1/cinelerra/videodevice.C +++ b/cinelerra-5.1/cinelerra/videodevice.C @@ -351,7 +351,7 @@ void VideoDevice::fix_asset(Asset *asset, int driver) // Fix asset using legacy routine const char *vcodec = 0; switch(driver) { -#ifdef HAVE_DVB +#ifdef HAVE_DV case CAPTURE_IEC61883: case CAPTURE_FIREWIRE: vcodec = CODEC_TAG_DVSD; -- 2.26.2