Merge pull request #593 from stefansaraev/build-errors

fix some build errors
This commit is contained in:
Stephan Raue 2012-05-07 06:08:44 -07:00
commit 9fa5e419ce
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,17 @@
diff --git a/Makefile b/Makefile
index a8c7d97..6084cec 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,9 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o DVBAPI.o DVBAPISetup.o SCDeviceProbe.o SCDVBDevice.o UDPSocket.o SCCIAdapter.o Frame.o SCCAMSlot.o
# FFdeCSA
-CPUOPT ?= athlon64
-PARALLEL ?= PARALLEL_128_SSE
-CSAFLAGS ?= -fPIC -O3 -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3
+CPUOPT ?= pentium
+PARALLEL ?= PARALLEL_32_INT
+CSAFLAGS ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
FFDECSADIR = FFdecsa
FFDECSA = $(FFDECSADIR)/FFdecsa.o
FFDECSATEST = $(FFDECSADIR)/FFdecsa_test.done

View File

@ -0,0 +1,13 @@
diff --git a/lib/makefile.linux b/lib/makefile.linux
index dedf8cf..5fac196 100644
--- a/lib/makefile.linux
+++ b/lib/makefile.linux
@@ -38,7 +38,7 @@ endif
install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png
out/%: out/%.full
- objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@
+ $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
out/libdriveio.so.0.full:
mkdir -p out

View File

@ -24,12 +24,16 @@
. config/options $1
if [ ! "$OPENGL_SUPPORT" = "yes" ] ; then
EXTRAOPTS="--without-opengl"
fi
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--enable-shared \
--disable-static \
$EXTRAOPTS \
--without-portaudio \
make