diff --git a/media-gfx/qrencode/patches/qrencode-3.3.0.patchset b/media-gfx/qrencode/patches/qrencode-3.3.0.patchset new file mode 100644 index 000000000..42ef19567 --- /dev/null +++ b/media-gfx/qrencode/patches/qrencode-3.3.0.patchset @@ -0,0 +1,113 @@ +From e2478a5bf978e600a7b5a07af9672f0ac1359635 Mon Sep 17 00:00:00 2001 +From: Jessica Hamilton +Date: Sun, 19 Oct 2014 21:39:14 +0000 +Subject: Provide a preconfigured config.h + + +diff --git a/config.h b/config.h +new file mode 100644 +index 0000000..928db41 +--- /dev/null ++++ b/config.h +@@ -0,0 +1,98 @@ ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_DLFCN_H 1 ++ ++/* Define if you have the iconv() function and it works. */ ++/* #undef HAVE_ICONV */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the `pthread' library (-lpthread). */ ++/* #undef HAVE_LIBPTHREAD */ ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the `strdup' function. */ ++#define HAVE_STRDUP 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#define LT_OBJDIR ".libs/" ++ ++/* Major version number */ ++#define MAJOR_VERSION 3 ++ ++/* Micro version number */ ++#define MICRO_VERSION 0 ++ ++/* Minor version number */ ++#define MINOR_VERSION 3 ++ ++/* Define to 1 if your C compiler doesn't accept -c and -o together. */ ++/* #undef NO_MINUS_C_MINUS_O */ ++ ++/* Name of package */ ++#define PACKAGE "qrencode_kdl" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "" ++ ++/* Define to the home page for this package. */ ++#define PACKAGE_URL "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "" ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Version number of package */ ++#define VERSION "3.3.0" ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus ++/* #undef inline */ ++#endif ++ ++/* Define to 'static' if no test programs will be compiled. */ ++#define __STATIC static ++/* #undef WITH_TESTS */ ++ +-- +1.8.3.4 + diff --git a/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe b/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe index d4545fb04..6b3b06e66 100644 --- a/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe +++ b/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe @@ -1,6 +1,6 @@ SUMMARY="QR Code encoding library - KDL support" DESCRIPTION=" -QLibqrencode is a library for encoding data in a QR Code symbol, a kind of 2D \ +qrencode is a library for encoding data in a QR Code symbol, a kind of 2D \ symbology that can be scanned by handy terminals such as a mobile phone with \ CCD. The capacity of QR Code is up to 7000 digits or 4000 characters, and has \ high robustness. @@ -17,46 +17,35 @@ LICENSE="GNU LGPL v2.1" SRC_URI="http://fukuchi.org/works/qrencode/qrencode-$portVersion.tar.gz" CHECKSUM_SHA256="499b2c86c218b16378e2496fefc858e4db4271c048336a29df9cc5754413d1d1" SOURCE_DIR="qrencode-$portVersion" -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +PATCHES="qrencode-3.3.0.patchset" PROVIDES=" - qrencode$secondaryArchSuffix = $portVersion - lib:libqrencode$secondaryArchSuffix = 3.3.0 compat >= 3 - " -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - lib:libpng$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libpng$secondaryArchSuffix - devel:libz$secondaryArchSuffix + qrencode_kdl = $portVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:sed - cmd:awk + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld " BUILD() { - export CFLAGS="-Dmalloc=debug_malloc -Dcalloc=debug_calloc -Dfree=debug_free" - runConfigure ./configure --without-tools \ - --enable-static - make $jobArgs + export CFLAGS="" + gcc -c -static -Dmalloc=debug_malloc -Dcalloc=debug_calloc -Dfree=debug_free \ + -DHAVE_CONFIG_H=1 bitstream.c mask.c mmask.c mqrspec.c qrencode.c qrinput.c \ + qrspec.c rscode.c split.c + ar rcs libqrencode_kdl.a bitstream.o mask.o mmask.o mqrspec.o qrencode.o qrinput.o \ + qrspec.o rscode.o split.o } INSTALL() { - make install + mkdir -p $libDir + cp libqrencode_kdl.a $libDir/ - prepareInstalledDevelLibs libqrencode + prepareInstalledDevelLibs libqrencode_kdl # devel package packageEntries devel \ @@ -66,9 +55,9 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - qrencode${secondaryArchSuffix}_devel = $portVersion compat >= 3 - devel:libqrencode$secondaryArchSuffix = 3.3.0 compat >= 3 + qrencode_kdl_devel = $portVersion compat >= 3 + devel:libqrencode_kdl = 3.3.0 compat >= 3 " REQUIRES_devel=" - qrencode$secondaryArchSuffix == $portVersion + haiku >= $haikuVersion "