mjpegtools: enable x86_64.

This commit is contained in:
Jerome Duval
2014-06-13 16:49:33 +00:00
parent 2c24222f00
commit d3ebf027d7
2 changed files with 26 additions and 6 deletions

View File

@@ -14,8 +14,8 @@ COPYRIGHT="
SRC_URI="http://sourceforge.net/projects/mjpeg/files/mjpegtools/$portVersion/mjpegtools-$portVersion.tar.gz"
CHECKSUM_SHA256="864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407"
REVISION="1"
ARCHITECTURES="?x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
PATCHES="mjpegtools-2.1.0.patchset"
@@ -116,7 +116,7 @@ BUILD()
aclocal
autoconf
automake
runConfigure ./configure
runConfigure ./configure --disable-dependency-tracking
make $jobArgs
}

View File

@@ -1,11 +1,11 @@
From f4fa8ee2c60a7f6ce3e091e39e887337b30710d3 Mon Sep 17 00:00:00 2001
From 6bb33f02e730526ca22abe041a5f81c87bd137ce Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 11 Jun 2014 17:25:38 +0000
Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index 8ad5562..c0994fc 100644
index 8ad5562..8c9c428 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,9 @@ case $host in
@@ -18,8 +18,17 @@ index 8ad5562..c0994fc 100644
*)
AC_MSG_RESULT([no])
;;
@@ -355,7 +358,7 @@ case $host_cpu in
AC_DEFINE(HAVE_X86CPU,1, [Compiling for x86-64 architecture CPU])
have_x86cpu=true
have_x86_64cpu=true
- PROGRAM_NOPIC="-fno-PIC"
+ PROGRAM_NOPIC=""
;;
powerpc | powerpc64)
AC_MSG_RESULT(PowerPC)
diff --git a/lavtools/Makefile.am b/lavtools/Makefile.am
index 117dce7..e84a3c2 100644
index 117dce7..417d7d2 100644
--- a/lavtools/Makefile.am
+++ b/lavtools/Makefile.am
@@ -152,7 +152,7 @@ jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la $(JPEG_LIBS)
@@ -50,6 +59,17 @@ index d84890b..3b0a4ec 100644
// Create the thread.
nErr = pthread_create (&m_oThreadInfo,
diff --git a/yuvscaler/Makefile.am b/yuvscaler/Makefile.am
index 1fe4d75..d855a93 100644
--- a/yuvscaler/Makefile.am
+++ b/yuvscaler/Makefile.am
@@ -18,6 +18,5 @@ noinst_HEADERS = \
EXTRA_DIST = yuvscaler_implementation.txt
-yuvscaler_CFLAGS=@PROGRAM_NOPIC@
yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
--
1.8.3.4