From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 12 May 2022 22:26:01 +0000 (-0600)
Subject: updating for Slackware compile by Andrew
X-Git-Tag: 2022-05~7
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=faaea1ce7a18979feba27c6e2127161995935a13;p=goodguy%2Fcinelerra.git

updating for Slackware compile by Andrew
---

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index cfde7345..1cf621b4 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -1063,12 +1063,12 @@ fi
 
 FFMPEG_EXTRA_LDFLAGS=""
 if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then
-  FFMPEG_EXTRA_LDFLAGS+=' -lva'
-  EXTRA_LIBS+=' -lva'
+  FFMPEG_EXTRA_LDFLAGS+=' -lva `pkg-config --libs libva`'
+  EXTRA_LIBS+=' -lva '
   WANT_VAAPI="yes"
   if test "x$HAVE_vaapi_x11" = "xyes"; then
     FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
-    EXTRA_LIBS+=' -lva-x11'
+    EXTRA_LIBS+=' -lva-x11 `pkg-config --libs x11`'
   fi
   if test "x$HAVE_vaapi_drm" = "xyes"; then
     FFMPEG_EXTRA_LDFLAGS+=' -lva-drm'
diff --git a/cinelerra-5.1/libzmpeg3/Makefile b/cinelerra-5.1/libzmpeg3/Makefile
index c5b8a083..7e96761f 100644
--- a/cinelerra-5.1/libzmpeg3/Makefile
+++ b/cinelerra-5.1/libzmpeg3/Makefile
@@ -89,7 +89,7 @@ endif
 LIBS += $(lib_a52dec) $(lib_djbfft) $(lib_libbthread)
 
 ifeq ($(DYNAMIC_FONTS), 1)
-LIBS += -lX11
+LIBS += -lX11 `pkg-config --libs x11`
 else
 CFLAGS += -DBUILTIN_FONT_DATA 
 OBJS += $(OBJDIR)/xfont1.o
diff --git a/cinelerra-5.1/mpeg2enc/Makefile b/cinelerra-5.1/mpeg2enc/Makefile
index bab267cf..ceac3cec 100644
--- a/cinelerra-5.1/mpeg2enc/Makefile
+++ b/cinelerra-5.1/mpeg2enc/Makefile
@@ -7,7 +7,7 @@ CC = gcc
 CFLAGS += -I$(TOPDIR)/libzmpeg3
 
 ifeq ($(OBJDIR), i686)
-CFLAGS += -DX86_CPU
+CFLAGS += -DX86_CPU -march=i686 -mcpu=i686 -fomit-frame-pointer
 NASMOBJ = \
 	$(OBJDIR)/bdist1_mmx.o \
 	$(OBJDIR)/bdist2_mmx.o \
diff --git a/cinelerra-5.1/mpeg2enc/mmx.h b/cinelerra-5.1/mpeg2enc/mmx.h
index c78e1859..9b8eab61 100644
--- a/cinelerra-5.1/mpeg2enc/mmx.h
+++ b/cinelerra-5.1/mpeg2enc/mmx.h
@@ -43,7 +43,7 @@ typedef	union {
 #define	mmx_si2r(op,imm,reg) \
 	__asm__ __volatile__ (#op " %0, %%" #reg \
 			      : /* nothing */ \
-			      : "J" (imm) )
+			      : "X" (imm) )
 
 #define	mmx_m2r(op,mem,reg) \
 	__asm__ __volatile__ (#op " %0, %%" #reg \