# with-libzmpeg3
zmp_install:
cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" \
- zmpeg3{cat,cc2txt,ifochk,show,toc}
+ zmpeg3{cc2txt,ifochk}
cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
hveg2enc mpeg2enc mplex mplexlo
zmp_uninstall:
- rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cat,cc2txt,ifochk,show,toc}
+ rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cc2txt,ifochk}
# with-commercial
com_install:
tags:
ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
-$(OBJDIR)/fileexr.o: BFLAGS:= -Wno-deprecated
+$(OBJDIR)/fileexr.o: BFLAGS:= -Wno-deprecated -std=c++11
$(OBJDIR)/sha1.o: BFLAGS:= -O3
$(OVERLAYS): BFLAGS:= -Ofast -g0
int text_x = wave_x - get_text_width(SMALLFONT, string) - theme->widget_border;
draw_text(text_x, text_y, string);
- int y1 = CLAMP(y, 0, waveform->get_h() - 1);
- waveform->draw_line(0, y1, wave_w, y1);
+ CLAMP(y, 0, waveform->get_h() - 1);
+ waveform->draw_line(0, y, wave_w, y);
//waveform->draw_rectangle(0, 0, wave_w, wave_h);
}
set_line_dashes(0);
-DCMAKE_BUILD_TYPE=RELEASE \
-DWITH_IPP=OFF \
-DWITH_LAPACK=OFF \
+ -DWITH_GPHOTO2=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DINSTALL_C_EXAMPLES=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DCMAKE_BUILD_TYPE=RELEASE \
-DWITH_IPP=OFF \
-DWITH_LAPACK=OFF \
+ -DWITH_GPHOTO2=OFF \
-DBUILD_SHARED_LIBS=ON \
-DINSTALL_C_EXAMPLES=ON \
-DINSTALL_PYTHON_EXAMPLES=ON \
r = r + TOTAL_TRANSFER(r, r_factor); \
g = g + TOTAL_TRANSFER(g, g_factor); \
b = b + TOTAL_TRANSFER(b, b_factor); \
- r = CLAMP(r,0,1); g = CLAMP(g,0,1); b = CLAMP(b,0,1); \
+ CLAMP(r,0,1); CLAMP(g,0,1); CLAMP(b,0,1); \
/* Apply saturation/value */ \
float h, s, v; \
HSV::rgb_to_hsv(r, g, b, h, s, v); \
v += TOTAL_TRANSFER(v, v_factor); \
s += TOTAL_TRANSFER(s, s_factor); \
- s = CLAMP(s,0,1); v = CLAMP(v,0,1); \
+ CLAMP(s,0,1); CLAMP(v,0,1); \
HSV::hsv_to_rgb(r, g, b, h, s, v);
libwebp.mak_params?= -C build all install DESTDIR=$(call bld_path,libwebp)
mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,build)"
mjpegtools.cfg_vars?= ./autogen.sh;
-mjpegtools.cfg_params?= --enable-shared=no --without-libsdl --without-sdlgfx --without-v4l
+mjpegtools.cfg_params?= --enable-shared=no --without-libquicktime --without-libdv \
+ --without-libpng --without-dga --without-gtk --without-libsdl --without-sdlgfx
mjpegtools.mak_params?= all
ladspa.cfg_vars?= CFLAGS+=' -Dinline="" '
ladspa.mak_params?=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa)
$(1).cfg_vars+=./waf --version; find .waf* -type f -name "*.py" | \
while read f; do sed -e '/StopIter/d' -i "$(DS)f"; done; \
echo 'exec ./waf configure "$(DS)@"' > ./configure; chmod +x \
- ./configure; PKG_CONFIG_PATH=$(LV2_PKGCFG) LD_LIBRARY_PATH=$(LV2_LIBPATH)
+ ./configure; PKG_CONFIG_PATH=$(LV2_PKGCFG):$(PKG_CONFIG_PATH) LD_LIBRARY_PATH=$(LV2_LIBPATH)
$(1).cfg_params+=\
CFLAGS="-I$(call bld_path,lv2) $(foreach f,$(2), $(call inc_path,$(f))) -fPIC -std=c99"\
- LDFLAGS="-lm $(foreach f,$(2), $(call ld_path,$(f),usr/local/lib)) "
+ LDFLAGS="-lm `pkg-config --libs x11` $(foreach f,$(2), $(call ld_path,$(f),usr/local/lib)) "
$(1).mak_vars=(echo "all:"; echo " ./waf -v build") > $(call bld_path,$(1),Makefile);
$(1).mak_params+=; ( cd $(1)*; ./waf install --destdir=$(call bld_path,$(1)) )
endef
-SYS_LIB:=$(notdir $(lastword $(wildcard /usr/lib /usrlib32 /usr/lib64)))
+SYS_LIB:=$(notdir $(lastword $(wildcard /usr/lib /usr/lib32 /usr/lib64)))
SYS_LV2:=$(lastword $(wildcard /usr/$(SYS_LIB)/lv2 /usr/local/$(SYS_LIB)/lv2))
$(if $(SYS_LV2),,$(eval SYS_LV2:=/usr/$(SYS_LIB)/lv2))
lv2.cfg_params?= --lv2dir=$(SYS_LV2)
serd.cfg_params?= --static --no-shared
sord.cfg_params?= --static --no-shared
lilv.cfg_params?= --static --dyn-manifest
-suil.cfg_params?= --static --no-qt
+suil.cfg_params?= --static --no-qt --no-qt5
$(eval $(call waf-setup,lv2))
$(eval $(call waf-setup,serd))
projects / goodguy / cinelerra.git / commitdiff
