code
string
repo_name
string
path
string
language
string
license
string
size
int64
Makefile: revert libselinux: use ln --relative to create .so symlinks This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 ln --relative is too recent to be available in all distributions, especially enterprise-grade distros that can stick around as long as they are maintained (up to 10 years in some cases?). For the sake of Buildroot, revert the upstream patch. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> diff -durN a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -151,7 +151,7 @@ install -m 755 $(LIBSO) $(SHLIBDIR) test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig - ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) + cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) install-pywrap: pywrap test -d $(PYLIBDIR)/site-packages/selinux || install -m 755 -d $(PYLIBDIR)/site-packages/selinux
shibajee/buildroot
package/libselinux/0003-revert-ln-relative.patch
patch
mit
941
config BR2_PACKAGE_LIBSELINUX bool "libselinux" select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # Uses <fts.h>, not available in musl or uClibc depends on BR2_TOOLCHAIN_USES_GLIBC # Toolchain issue: "fixup not contained within frag" depends on !BR2_arc help libselinux is the runtime SELinux library that provides interfaces (e.g. library functions for the SELinux kernel APIs like getcon(), other support functions like getseuserbyname()) to SELinux-aware applications. libselinux may use the shared libsepol to manipulate the binary policy if necessary (e.g. to downgrade the policy format to an older version supported by the kernel) when loading policy. http://selinuxproject.org/page/Main_Page comment "libselinux needs a glibc toolchain w/ threads, dynamic library" depends on !BR2_arc depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_USES_GLIBC
shibajee/buildroot
package/libselinux/Config.in
in
mit
989
# Locally computed sha256 94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f libselinux-2.5.tar.gz
shibajee/buildroot
package/libselinux/libselinux.hash
hash
mit
113
################################################################################ # # libselinux # ################################################################################ LIBSELINUX_VERSION = 2.5 LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE LIBSELINUX_DEPENDENCIES = libsepol pcre LIBSELINUX_INSTALL_STAGING = YES # Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. LIBSELINUX_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" \ ARCH=$(KERNEL_ARCH) define LIBSELINUX_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. $(MAKE) -C $(@D) $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all endef define LIBSELINUX_INSTALL_STAGING_CMDS $(MAKE) -C $(@D) $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endef define LIBSELINUX_INSTALL_TARGET_CMDS $(MAKE) -C $(@D) $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install # Create the selinuxfs mount point if [ ! -d "$(TARGET_DIR)/selinux" ]; then mkdir $(TARGET_DIR)/selinux; fi if ! grep -q "selinuxfs" $(TARGET_DIR)/etc/fstab; then \ echo "none /selinux selinuxfs noauto 0 0" >> $(TARGET_DIR)/etc/fstab ; fi endef HOST_LIBSELINUX_DEPENDENCIES = \ host-libsepol host-pcre host-swig ifeq ($(BR2_PACKAGE_PYTHON3),y) HOST_LIBSELINUX_DEPENDENCIES += host-python3 HOST_LIBSELINUX_PYTHONLIBDIR = -L$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/ HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) else HOST_LIBSELINUX_DEPENDENCIES += host-python HOST_LIBSELINUX_PYTHONLIBDIR = -L$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/ HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/ HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) endif HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ PYINC="$(HOST_LIBSELINUX_PYINC)" \ PYTHONLIBDIR="$(HOST_LIBSELINUX_PYTHONLIBDIR)" \ PYLIBVER="$(HOST_LIBSELINUX_PYLIBVER)" \ SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/" define HOST_LIBSELINUX_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. $(MAKE1) -C $(@D) $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/usr/lib all # Generate python interface wrapper $(MAKE1) -C $(@D) $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap endef define HOST_LIBSELINUX_INSTALL_CMDS $(MAKE) -C $(@D) $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/usr/lib SBINDIR=$(HOST_DIR)/usr/sbin install (cd $(HOST_DIR)/usr/lib; $(HOSTLN) -sf libselinux.so.1 libselinux.so) # Install python interface wrapper $(MAKE) -C $(@D) $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap endef $(eval $(generic-package)) $(eval $(host-generic-package))
shibajee/buildroot
package/libselinux/libselinux.mk
mk
mit
3,097
Do not make symbols hidden on Blackfin The libselinux logic to hide internal symbols from the DSO doesn't work properly on Blackfin due to the USER_LABEL_PREFIX not being handled properly. A real fix is not that simple, so this patch simply disables the internal symbol hiding mechanism. This means that those symbols are visible in the final DSO, which is not a problem for proper execution, it just isn't as clean. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Adam Duskett <Aduskett@gmail.com> Index: b/src/dso.h =================================================================== --- a/src/dso.h +++ b/src/dso.h @@ -1,7 +1,7 @@ #ifndef _SEPOL_DSO_H #define _SEPOL_DSO_H 1 -#ifdef SHARED +#if defined(SHARED) && !defined(__bfin__) # define hidden __attribute__ ((visibility ("hidden"))) # define hidden_proto(fct) __hidden_proto (fct, fct##_internal) # define __hidden_proto(fct, internal) \
shibajee/buildroot
package/libsemanage/0001-workaround-blackfin-issue.patch
patch
mit
944
config BR2_PACKAGE_LIBSEMANAGE bool "libsemanage" select BR2_PACKAGE_AUDIT select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_USTR select BR2_PACKAGE_BZIP2 depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # - libselinux needs fts.h (not available in uClibc/musl) # - libsemanage itself needs getpwent_r() not available in musl # - audit is not available on musl depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_arc help libsemanage is the policy management library. It uses libsepol for binary policy manipulation and libselinux for interacting with the SELinux system. It also exec's helper programs for loading policy and for checking whether the file_contexts configuration is valid (load_policy and setfiles from policycoreutils) presently, although this may change at least for the bootstrapping case (for rpm). http://selinuxproject.org/page/Main_Page comment "libsemanage needs a glibc toolchain w/ threads, dynamic library" depends on !BR2_arc depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_USES_GLIBC
shibajee/buildroot
package/libsemanage/Config.in
in
mit
1,188
# Locally computed sha256 46e2f36254369b6e91d1eea0460c262b139361b055a3a67d3ceea2d8ef72e006 libsemanage-2.5.tar.gz
shibajee/buildroot
package/libsemanage/libsemanage.hash
hash
mit
114
################################################################################ # # libsemanage # ################################################################################ LIBSEMANAGE_VERSION = 2.5 LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223 LIBSEMANAGE_LICENSE = LGPLv2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux ustr bzip2 LIBSEMANAGE_INSTALL_STAGING = YES LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) define LIBSEMANAGE_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all endef define LIBSEMANAGE_INSTALL_STAGING_CMDS $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endef define LIBSEMANAGE_INSTALL_TARGET_CMDS $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install endef HOST_LIBSEMANAGE_DEPENDENCIES = host-bison host-audit host-libsepol host-libselinux \ host-ustr host-bzip2 host-swig HOST_LIBSEMANAGE_MAKE_OPTS += $(HOST_CONFIGURE_OPTS) \ SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/" ifeq ($(BR2_PACKAGE_PYTHON3),y) HOST_LIBSEMANAGE_DEPENDENCIES += host-python3 HOST_LIBSEMANAGE_MAKE_OPTS += \ PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/" \ PYTHONLIBDIR="-L$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/" \ PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" else HOST_LIBSEMANAGE_DEPENDENCIES += host-python HOST_LIBSEMANAGE_MAKE_OPTS += \ PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \ PYTHONLIBDIR="-L$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/" \ PYLIBVER="python$(PYTHON_VERSION_MAJOR)" endif define HOST_LIBSEMANAGE_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) all $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap endef define HOST_LIBSEMANAGE_INSTALL_CMDS $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) install $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap endef $(eval $(generic-package)) $(eval $(host-generic-package))
shibajee/buildroot
package/libsemanage/libsemanage.mk
mk
mit
2,291
Add support for static-only build Instead of unconditionally building shared libraries, this patch improves the libsepol build system with a "STATIC" variable, which when defined to some non-empty value, will disable the build of shared libraries. It allows to support cases where the target architecture does not have support for shared libraries. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Adam Duskett <Aduskett@gmail.com> Index: b/src/Makefile =================================================================== diff --git a/src/Makefile b/src/Makefile index db6c2ba..0006285 100644 --- a/src/Makefile +++ b/src/Makefile @@ -30,8 +30,12 @@ LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATE override CFLAGS += -I$(CILDIR)/include endif +ALL_TARGETS = $(LIBA) $(LIBPC) +ifeq ($(STATIC),) +ALL_TARGETS += $(LIBSO) +endif -all: $(LIBA) $(LIBSO) $(LIBPC) +all: $(ALL_TARGETS) $(LIBA): $(OBJS) @@ -66,11 +70,13 @@ install: all test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) install -m 644 $(LIBA) $(LIBDIR) - test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) - install -m 755 $(LIBSO) $(SHLIBDIR) test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig +ifeq ($(STATIC),) + test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) + install -m 755 $(LIBSO) $(SHLIBDIR) ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) +endif relabel: /sbin/restorecon $(SHLIBDIR)/$(LIBSO)
shibajee/buildroot
package/libsepol/0001-support-static-only.patch
patch
mit
1,541
Do not make symbols hidden on Blackfin The libselinux logic to hide internal symbols from the DSO doesn't work properly on Blackfin due to the USER_LABEL_PREFIX not being handled properly. A real fix is not that simple, so this patch simply disables the internal symbol hiding mechanism. This means that those symbols are visible in the final DSO, which is not a problem for proper execution, it just isn't as clean. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Adam Duskett <Aduskett@gmail.com> Index: b/src/dso.h =================================================================== --- a/src/dso.h +++ b/src/dso.h @@ -5,7 +5,7 @@ #define DISABLE_SYMVER 1 #endif -#ifdef SHARED +#if defined(SHARED) && !defined(__bfin__) # define hidden __attribute__ ((visibility ("hidden"))) # define hidden_proto(fct) __hidden_proto (fct, fct##_internal) # define __hidden_proto(fct, internal) \
shibajee/buildroot
package/libsepol/0002-workaround-blackfin-issue.patch
patch
mit
937
Add missing <stdarg.h> include This is needed to fix the build on uClibc, due to the usage of va_list. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Index: b/cil/src/cil_log.h =================================================================== --- a/cil/src/cil_log.h +++ b/cil/src/cil_log.h @@ -30,6 +30,7 @@ #define CIL_LOG_H_ #include <stdlib.h> +#include <stdarg.h> #include <cil/cil.h> #define MAX_LOG_SIZE 512
shibajee/buildroot
package/libsepol/0003-add-stdarg-include.patch
patch
mit
450
Makefile: revert libsepol: use ln --relative to create .so symlinks This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 ln --relative is too recent to be available in all distributions, especially enterprise-grade distros that can stick around as long as they are maintained (up to 10 years in some cases?). For the sake of Buildroot, revert the upstream patch. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> diff -durN a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -77,7 +77,7 @@ ifeq ($(STATIC),) test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) install -m 755 $(LIBSO) $(SHLIBDIR) - ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) + cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) endif relabel:
shibajee/buildroot
package/libsepol/0004-revert-ln-relative.patch
patch
mit
788
config BR2_PACKAGE_LIBSEPOL bool "libsepol" help Libsepol is the binary policy manipulation library. It doesn't depend upon or use any of the other SELinux components. http://selinuxproject.org/page/Main_Page
shibajee/buildroot
package/libsepol/Config.in
in
mit
221
# From https://github.com/SELinuxProject/selinux/wiki/Releases sha256 2bdeec56d0a08b082b93b40703b4b3329cc5562152f7254d8f6ef6b56afe850a libsepol-2.5.tar.gz
shibajee/buildroot
package/libsepol/libsepol.hash
hash
mit
156
################################################################################ # # libsepol # ################################################################################ LIBSEPOL_VERSION = 2.5 LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223 LIBSEPOL_LICENSE = LGPLv2.1+ LIBSEPOL_LICENSE_FILES = COPYING LIBSEPOL_INSTALL_STAGING = YES LIBSEPOL_DEPENDENCIES = host-flex HOST_LIBSEPOL_DEPENDENCIES = host-flex LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ifeq ($(BR2_STATIC_LIBS),y) LIBSEPOL_MAKE_FLAGS += STATIC=1 endif define LIBSEPOL_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. $(MAKE) -C $(@D) $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) endef define LIBSEPOL_INSTALL_STAGING_CMDS $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) endef define LIBSEPOL_INSTALL_TARGET_CMDS $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(TARGET_DIR) endef define HOST_LIBSEPOL_BUILD_CMDS $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) endef define HOST_LIBSEPOL_INSTALL_CMDS $(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) mv $(HOST_DIR)/lib/libsepol.so.1 $(HOST_DIR)/usr/lib (cd $(HOST_DIR)/usr/lib; rm -f libsepol.so; ln -s libsepol.so.1 libsepol.so) -rmdir $(HOST_DIR)/lib endef $(eval $(generic-package)) $(eval $(host-generic-package))
shibajee/buildroot
package/libsepol/libsepol.mk
mk
mit
1,419
Disable build of Python bindings, which requires the sipconfig module. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> diff -purN libserial-0.6.0rc2.orig/Makefile.am libserial-0.6.0rc2/Makefile.am --- libserial-0.6.0rc2.orig/Makefile.am 2014-06-05 18:37:25.000000000 +0200 +++ libserial-0.6.0rc2/Makefile.am 2015-07-30 20:59:28.828429011 +0200 @@ -1,4 +1,4 @@ -SUBDIRS=src doc examples sip +SUBDIRS=src doc examples ACLOCAL_AMFLAGS=-I m4 EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc diff -purN libserial-0.6.0rc2.orig/Makefile.in libserial-0.6.0rc2/Makefile.in --- libserial-0.6.0rc2.orig/Makefile.in 2014-06-05 18:40:09.000000000 +0200 +++ libserial-0.6.0rc2/Makefile.in 2015-07-30 21:00:09.215188376 +0200 @@ -348,7 +348,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = src doc examples sip +SUBDIRS = src doc examples ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc pkgconfigdir = $(libdir)/pkgconfig
shibajee/buildroot
package/libserial/0001-disable-python-bindings.patch
patch
mit
1,139
From 47ca0621ccd2100e4ba0d7f4e2a861d14f05f63c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Tue, 17 Nov 2015 23:50:14 +0100 Subject: [PATCH] Don't use high baudrates when not available On certain architectures (namely Sparc), the maximum baud rate exposed by the kernel headers is B2000000. Therefore, the current libserial code doesn't build for the Sparc and Sparc64 architectures due to this. In order to address this problem, this patch tests the value of __MAX_BAUD. If it's higher than B2000000 then we assume we're on an architecture that supports all baud rates up to B4000000. Otherwise, we simply don't support the baud rates above B2000000. Fixes build failures such as: ./SerialPort.h:88:24: error: 'B2500000' was not declared in this scope BAUD_2500000 = B2500000, Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- src/SerialPort.h | 2 ++ src/SerialStreamBuf.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/SerialPort.h b/src/SerialPort.h index 6c0baaa..0b1af4c 100644 --- a/src/SerialPort.h +++ b/src/SerialPort.h @@ -85,11 +85,13 @@ public: BAUD_1152000 = B1152000, BAUD_1500000 = B1500000, BAUD_2000000 = B2000000, +#if __MAX_BAUD > B2000000 BAUD_2500000 = B2500000, BAUD_3000000 = B3000000, BAUD_3500000 = B3500000, BAUD_4000000 = B4000000, #endif +#endif /* __linux__ */ BAUD_DEFAULT = BAUD_57600 } ; diff --git a/src/SerialStreamBuf.h b/src/SerialStreamBuf.h index ccbb996..174f31c 100644 --- a/src/SerialStreamBuf.h +++ b/src/SerialStreamBuf.h @@ -85,11 +85,13 @@ extern "C++" BAUD_1152000 = SerialPort::BAUD_1152000, BAUD_1500000 = SerialPort::BAUD_1500000, BAUD_2000000 = SerialPort::BAUD_2000000, +#if __MAX_BAUD > B2000000 BAUD_2500000 = SerialPort::BAUD_2500000, BAUD_3000000 = SerialPort::BAUD_3000000, BAUD_3500000 = SerialPort::BAUD_3500000, BAUD_4000000 = SerialPort::BAUD_4000000, #endif +#endif /* __linux__ */ BAUD_DEFAULT = SerialPort::BAUD_DEFAULT, BAUD_INVALID = -1 } ; -- 2.6.3
shibajee/buildroot
package/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch
patch
mit
2,275
config BR2_PACKAGE_LIBSERIAL bool "libserial" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR # boost select BR2_PACKAGE_BOOST help Simplified serial port programming in C++ under POSIX operating systems. http://libserial.sourceforge.net/ comment "libserial needs a toolchain w/ C++, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
shibajee/buildroot
package/libserial/Config.in
in
mit
455
# From http://sourceforge.net/projects/libserial/files/libserial/0.6.0rc2/ sha1 e09113be3ba595135e95e853003ff96feea0da63 libserial-0.6.0rc2.tar.gz md5 7787679b22901e4810bc53ecccdf8266 libserial-0.6.0rc2.tar.gz # Locally calculated sha256 35ee29eb1369d52ffb8658237577692f991eb508320d0abbb71c53e6494a1c23 libserial-0.6.0rc2.tar.gz
shibajee/buildroot
package/libserial/libserial.hash
hash
mit
333
################################################################################ # # libserial # ################################################################################ LIBSERIAL_VERSION = 0.6.0rc2 LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial LIBSERIAL_INSTALL_STAGING = YES LIBSERIAL_LICENSE = GPLv2+ LIBSERIAL_LICENSE_FILES = COPYING LIBSERIAL_DEPENDENCIES = boost LIBSERIAL_CONF_ENV = ac_cv_prog_DOCBOOK2PDF=no $(eval $(autotools-package))
shibajee/buildroot
package/libserial/libserial.mk
mk
mit
470
From faab9aa5879fab93556b7a3a6f24070eeb3cbf15 Mon Sep 17 00:00:00 2001 From: Paul Cercueil <paul.cercueil@analog.com> Date: Mon, 29 Aug 2016 11:11:01 +0200 Subject: [PATCH] Fix Linux files not compiled in with a toolchain for ucLinux Signed-off-by: Paul Cercueil <paul.cercueil@analog.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f6b66e8..de6f5b9 100644 --- a/configure.ac +++ b/configure.ac @@ -74,7 +74,7 @@ AC_DEFINE_UNQUOTED([SP_LIB_VERSION_REVISION], [$SP_LIB_VERSION_REVISION], [.]) AC_DEFINE_UNQUOTED([SP_LIB_VERSION_AGE], [$SP_LIB_VERSION_AGE], [.]) AC_DEFINE_UNQUOTED([SP_LIB_VERSION_STRING], ["$SP_LIB_VERSION"], [.]) -AM_CONDITIONAL([LINUX], [test -z "${host_os##linux*}"]) +AM_CONDITIONAL([LINUX], [test -z "${host_os##linux*}" || test -z "${host_os##uclinux*}"]) AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"]) AM_CONDITIONAL([MACOSX], [test -z "${host_os##darwin*}"]) AM_CONDITIONAL([FREEBSD], [test -z "${host_os##freebsd*}"]) -- 2.8.1
shibajee/buildroot
package/libserialport/0001-uclinux-detection.patch
patch
mit
1,082
config BR2_PACKAGE_LIBSERIALPORT bool "libserialport" help Libserialport is a minimal, cross-platform shared library written in C that is intended to take care of the OS-specific details when writing software that uses serial ports. http://sigrok.org/wiki/Libserialport
shibajee/buildroot
package/libserialport/Config.in
in
mit
288
# Locally computed sha256 4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d libserialport-0.1.1.tar.gz
shibajee/buildroot
package/libserialport/libserialport.hash
hash
mit
118
################################################################################ # # libserialport # ################################################################################ LIBSERIALPORT_VERSION = 0.1.1 LIBSERIALPORT_SITE = http://sigrok.org/download/source/libserialport LIBSERIALPORT_LICENSE = LGPLv3+ LIBSERIALPORT_LICENSE_FILES = COPYING LIBSERIALPORT_INSTALL_STAGING = YES LIBSERIALPORT_DEPENDENCIES = host-pkgconf LIBSERIALPORT_AUTORECONF = YES $(eval $(autotools-package))
shibajee/buildroot
package/libserialport/libserialport.mk
mk
mit
491
config BR2_PACKAGE_LIBSEXY bool "libsexy" depends on BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 help libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel by subclassing them and working around the limitations of the widgets. http://www.chipx86.com/wiki/Libsexy
shibajee/buildroot
package/libsexy/Config.in
in
mit
352
# Locally calculated sha256 8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e libsexy-0.1.11.tar.gz
shibajee/buildroot
package/libsexy/libsexy.hash
hash
mit
115
################################################################################ # # libsexy # ################################################################################ LIBSEXY_VERSION = 0.1.11 LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy LIBSEXY_DEPENDENCIES = libgtk2 libxml2 LIBSEXY_INSTALL_STAGING = YES LIBSEXY_LICENSE = LGPLv2.1+ LIBSEXY_LICENSE_FILES = COPYING $(eval $(autotools-package))
shibajee/buildroot
package/libsexy/libsexy.mk
mk
mit
420
config BR2_PACKAGE_LIBSHA1 bool "libsha1" help libsha1 is a tiny library providing SHA1 implementation, created for facilitating X server compilation on devices when larger libraries containing SHA1 implementations (OpenSSL, Mozilla NSS) are not needed. https://github.com/dottedmag/libsha1
shibajee/buildroot
package/libsha1/Config.in
in
mit
309
# Locally calculated sha256 ef4c75007ac41c3dc09e0225943c789ba2b9c632a6cd7b548e0519477ac2f768 libsha1-0.3.tar.gz
shibajee/buildroot
package/libsha1/libsha1.hash
hash
mit
113
################################################################################ # # libsha1 # ################################################################################ LIBSHA1_VERSION = 0.3 LIBSHA1_SITE = $(call github,dottedmag,libsha1,$(LIBSHA1_VERSION)) LIBSHA1_LICENSE = BSD-3c or GPL LIBSHA1_LICENSE_FILES = COPYING LIBSHA1_INSTALL_STAGING = YES # We're getting the source code from GitHub, so there is no generated # configure script in the tarball. LIBSHA1_AUTORECONF = YES $(eval $(autotools-package))
shibajee/buildroot
package/libsha1/libsha1.mk
mk
mit
522
config BR2_PACKAGE_LIBSHAIRPLAY bool "libshairplay" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # avahi depends on !BR2_STATIC_LIBS # avahi select BR2_PACKAGE_AVAHI select BR2_PACKAGE_AVAHI_DAEMON select BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY # runtime help libshairplay is a client library that emulates an airplay server. https://github.com/juhovh/shairplay comment "libshairplay needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
shibajee/buildroot
package/libshairplay/Config.in
in
mit
548
# Locally computed sha256 49ac0e0470ec6367f720c7b79a09165138f57b60f5949a2d9c38be5823d13294 libshairplay-ce80e005908f41d0e6fde1c4a21e9cb8ee54007b.tar.gz
shibajee/buildroot
package/libshairplay/libshairplay.hash
hash
mit
152
################################################################################ # # libshairplay # ################################################################################ LIBSHAIRPLAY_VERSION = ce80e005908f41d0e6fde1c4a21e9cb8ee54007b LIBSHAIRPLAY_SITE = $(call github,juhovh,shairplay,$(LIBSHAIRPLAY_VERSION)) LIBSHAIRPLAY_INSTALL_STAGING = YES LIBSHAIRPLAY_AUTORECONF = YES LIBSHAIRPLAY_LICENSE = MIT, BSD-3c, LGPLv2.1+ LIBSHAIRPLAY_LICENSE_FILES = LICENSE LIBSHAIRPLAY_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_LIBAO),libao) $(eval $(autotools-package))
shibajee/buildroot
package/libshairplay/libshairplay.mk
mk
mit
574
From d96a3cafeebeb80b4796bacbe0e6da0bbd3ee48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> Date: Sun, 28 Aug 2016 00:39:55 +0200 Subject: [PATCH 1/2] Fix {THEORA,SPEEX}_LDFLAGS typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed to properly link against libshout, otherwise the build fails with: error: LDFLAGS: No such file or directory Upstream status: pending https://github.com/xiph/Icecast-libshout/pull/4 Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 87a7f55..85f18ad 100644 --- a/configure.ac +++ b/configure.ac @@ -134,7 +134,7 @@ PKG_CHECK_MODULES(THEORA, theora, [ ]) fi XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$THEORA_CFLAGS]) -XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA LDFLAGS $THEORA_LIBS]) +XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA_LDFLAGS $THEORA_LIBS]) AM_CONDITIONAL([HAVE_THEORA], [test -n "$THEORA_LIBS"]) if test -n "$THEORA_LIBS" then @@ -153,7 +153,7 @@ PKG_CHECK_MODULES(SPEEX, speex, [ ]) fi XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$SPEEX_CFLAGS]) -XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX LDFLAGS $SPEEX_LIBS]) +XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX_LDFLAGS $SPEEX_LIBS]) AM_CONDITIONAL([HAVE_SPEEX], [test -n "$SPEEX_LIBS"]) if test -n "$SPEEX_LIBS" then -- 2.9.3
shibajee/buildroot
package/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch
patch
mit
1,421
From 69774132422af1d017008eb5daed8e2099d2fa0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> Date: Wed, 31 Aug 2016 21:55:51 +0200 Subject: [PATCH 2/2] Make sure @SHOUT_REQUIRES@ contains OpenSSL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Static linking userspace programs such as mpd against libshout currently doesn't work out of the box, because libshout is linked against libssl, but this isn't expressed in libshouts pkg-config file: ``` /usr/lib/libshout.a(tls.o): In function `tls_check_cert': tls.c:(.text+0x10): undefined reference to `SSL_get_peer_certificate' tls.c:(.text+0x24): undefined reference to `SSL_get_verify_result' tls.c:(.text+0x4c): undefined reference to `X509_get_subject_name' tls.c:(.text+0x60): undefined reference to `X509_NAME_get_text_by_NID' tls.c:(.text+0x118): undefined reference to `X509_NAME_get_entry' tls.c:(.text+0x11c): undefined reference to `X509_NAME_ENTRY_get_data' tls.c:(.text+0x120): undefined reference to `ASN1_STRING_length' tls.c:(.text+0x148): undefined reference to `X509_free' tls.c:(.text+0x178): undefined reference to `X509_NAME_get_index_by_NID' ``` Since OpenSSL installs its own .pc files, make sure that @SHOUT_REQUIRES@ contains `ssl`. Upstream status: pending https://github.com/xiph/Icecast-libshout/pull/5 Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 85f18ad..2b9c505 100644 --- a/configure.ac +++ b/configure.ac @@ -197,6 +197,10 @@ XIPH_PATH_OPENSSL([ ]) AC_SUBST([SHOUT_TLS]) AM_CONDITIONAL([HAVE_TLS], [test -n "$OPENSSL_LIBS"]) +if test "$SHOUT_TLS" = "1" +then + SHOUT_REQUIRES="$SHOUT_REQUIRES, libssl" +fi SHOUT_VERSION="$VERSION" SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS" -- 2.9.3
shibajee/buildroot
package/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch
patch
mit
1,918
config BR2_PACKAGE_LIBSHOUT bool "libshout" select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBVORBIS help Libshout is a library for communicating with and sending data to an icecast server. It handles the socket connection, the timing of the data, and prevents bad data from getting to the icecast server. http://icecast.org/download/
shibajee/buildroot
package/libshout/Config.in
in
mit
350
# From https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libshout/Manifest # hash from http://downloads.xiph.org/releases/libshout/SHA256SUMS is wrong! sha256 f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d libshout-2.4.1.tar.gz
shibajee/buildroot
package/libshout/libshout.hash
hash
mit
254
################################################################################ # # libshout # ################################################################################ LIBSHOUT_VERSION = 2.4.1 LIBSHOUT_SITE = http://downloads.xiph.org/releases/libshout LIBSHOUT_LICENSE = LGPLv2+ LIBSHOUT_LICENSE_FILES = COPYING LIBSHOUT_INSTALL_STAGING = YES LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis # patching configure.ac LIBSHOUT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBTHEORA),y) LIBSHOUT_CONF_OPTS += --enable-theora LIBSHOUT_DEPENDENCIES += libtheora else LIBSHOUT_CONF_OPTS += --disable-theora endif ifeq ($(BR2_PACKAGE_SPEEX),y) LIBSHOUT_CONF_OPTS += --enable-speex LIBSHOUT_DEPENDENCIES += speex else LIBSHOUT_CONF_OPTS += --disable-speex endif ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSHOUT_CONF_OPTS += --with-openssl LIBSHOUT_DEPENDENCIES += openssl else LIBSHOUT_CONF_OPTS += --without-openssl endif $(eval $(autotools-package))
shibajee/buildroot
package/libshout/libshout.mk
mk
mit
949
Various fixes to compile libsidplay2 with newer gcc compilers Downloaded from http://tsubasa.googlecode.com/svn/trunk/tsubasa/sidplay2-libs/sidplay2-libs-2.1.1.diff Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- sidplay-libs-2.1.1.orig/Makefile.in +++ sidplay-libs-2.1.1/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.4 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -253,7 +253,7 @@ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -264,7 +264,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -z "$$unique" && unique=$$empty_fix; \ + test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique; \ fi --- sidplay-libs-2.1.1.orig/aclocal.m4 +++ sidplay-libs-2.1.1/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.8.4 -*- Autoconf -*- +# generated automatically by aclocal 1.8.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -40,7 +40,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.8.4])]) + [AM_AUTOMAKE_VERSION([1.8.5])]) # AM_AUX_DIR_EXPAND --- sidplay-libs-2.1.1.orig/builders/Makefile.in +++ sidplay-libs-2.1.1/builders/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.8.4 from Makefile.am. +# Makefile.in generated by automake 1.8.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -130,9 +130,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu builders/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign builders/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu builders/Makefile + $(AUTOMAKE) --foreign builders/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -234,7 +234,7 @@ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -245,7 +245,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -z "$$unique" && unique=$$empty_fix; \ + test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique; \ fi --- sidplay-libs-2.1.1.orig/builders/hardsid-builder/src/hardsid-builder.cpp +++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp @@ -47,6 +47,7 @@ ***************************************************************************/ #include <stdio.h> +#include <cstring> #include "config.h" #ifdef HAVE_EXCEPTIONS --- sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid-builder.cpp +++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp @@ -37,6 +37,7 @@ ***************************************************************************/ #include <stdio.h> +#include <cstring> #include "config.h" #ifdef HAVE_EXCEPTIONS --- sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid.cpp +++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp @@ -16,6 +16,7 @@ * * ***************************************************************************/ +#include <cstring> #include "config.h" #ifdef HAVE_EXCEPTIONS --- sidplay-libs-2.1.1.orig/configure.ac +++ sidplay-libs-2.1.1/configure.ac @@ -2,7 +2,7 @@ #Variables pwd=`pwd` -builders='${libdir}'/sidplay/builders +builders='${libdir}'/ ac_configure_args="$ac_configure_args --disable-library-checks" AC_CONFIG_AUX_DIR(unix) @@ -11,7 +11,7 @@ hardsid=false case "$host" in - *linux*) hardsid=true + *linux*|*-k*bsd*-gnu) hardsid=true ;; esac AM_CONDITIONAL(HARDSID, test x$hardsid = xtrue) --- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/SmartPtr.h +++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h @@ -17,16 +17,16 @@ doFree = bufOwner; if ( bufferLen >= 1 ) { - pBufCurrent = ( bufBegin = buffer ); - bufEnd = bufBegin + bufferLen; - bufLen = bufferLen; - status = true; + this->pBufCurrent = ( this->bufBegin = buffer ); + this->bufEnd = this->bufBegin + bufferLen; + this->bufLen = bufferLen; + this->status = true; } else { - pBufCurrent = ( bufBegin = ( bufEnd = 0 )); - bufLen = 0; - status = false; + this->pBufCurrent = ( this->bufBegin = ( this->bufEnd = 0 )); + this->bufLen = 0; + this->status = false; } } @@ -211,16 +211,16 @@ { if ( bufferLen >= 1 ) { - pBufCurrent = ( bufBegin = buffer ); - bufEnd = bufBegin + bufferLen; - bufLen = bufferLen; - status = true; + this->pBufCurrent = ( this->bufBegin = buffer ); + this->bufEnd = this->bufBegin + bufferLen; + this->bufLen = bufferLen; + this->status = true; } else { - pBufCurrent = bufBegin = bufEnd = 0; - bufLen = 0; - status = false; + this->pBufCurrent = this->bufBegin = this->bufEnd = 0; + this->bufLen = 0; + this->status = false; } } }; --- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/sidendian.h +++ sidplay-libs-2.1.1/libsidplay/include/sidplay/sidendian.h @@ -16,6 +16,10 @@ ***************************************************************************/ /*************************************************************************** * $Log: sidendian.h,v $ + * Revision 1.6 2005/11/20 11:02:06 s_a_white + * Work around for bug in gcc 4 (optimiser breaks if variable never has a + * direct assignment). + * * Revision 1.5 2001/07/03 22:44:13 s_a_white * Added endian_16 to convert a 16 bit value to an array of 8s. * @@ -141,7 +145,7 @@ // Convert high-byte and low-byte to 16-bit word. inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo) { - uint_least16_t word; + uint_least16_t word = 0; endian_16lo8 (word, lo); endian_16hi8 (word, hi); return word; @@ -165,7 +169,7 @@ inline void endian_16 (char ptr[2], uint_least16_t word) { - endian_16 ((uint8_t *) ptr, word); + endian_16 ((uint8_t *) ptr, word); } // Convert high-byte and low-byte to 16-bit little endian word. @@ -334,7 +338,7 @@ // Swap word endian. inline void endian_32swap8 (uint_least32_t &dword) { - uint_least16_t lo, hi; + uint_least16_t lo = 0, hi = 0; lo = endian_32lo16 (dword); hi = endian_32hi16 (dword); endian_16swap8 (lo); @@ -346,8 +350,8 @@ // Convert high-byte and low-byte to 32-bit word. inline uint_least32_t endian_32 (uint8_t hihi, uint8_t hilo, uint8_t hi, uint8_t lo) { - uint_least32_t dword; - uint_least16_t word; + uint_least32_t dword = 0; + uint_least16_t word = 0; endian_32lo8 (dword, lo); endian_32hi8 (dword, hi); endian_16lo8 (word, hilo); @@ -374,7 +378,7 @@ defined(SID_WORDS_LITTLEENDIAN) *((uint_least32_t *) ptr) = dword; #else - uint_least16_t word; + uint_least16_t word = 0; ptr[0] = endian_32lo8 (dword); ptr[1] = endian_32hi8 (dword); word = endian_32hi16 (dword); @@ -401,7 +405,7 @@ defined(SID_WORDS_BIGENDIAN) *((uint_least32_t *) ptr) = dword; #else - uint_least16_t word; + uint_least16_t word = 0; word = endian_32hi16 (dword); ptr[1] = endian_16lo8 (word); ptr[0] = endian_16hi8 (word); --- sidplay-libs-2.1.1.orig/libsidplay/unix/config.h.in +++ sidplay-libs-2.1.1/libsidplay/unix/config.h.in @@ -72,22 +72,22 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT /* The number of bytes in type long */ #undef SIZEOF_LONG -/* The size of a `long int', as computed by sizeof. */ +/* The size of `long int', as computed by sizeof. */ #undef SIZEOF_LONG_INT /* The number of bytes in type short */ #undef SIZEOF_SHORT -/* The size of a `short int', as computed by sizeof. */ +/* The size of `short int', as computed by sizeof. */ #undef SIZEOF_SHORT_INT /* The number of bytes in type void* */ --- sidplay-libs-2.1.1.orig/libsidplay/unix/my_macros.m4 +++ sidplay-libs-2.1.1/libsidplay/unix/my_macros.m4 @@ -105,8 +105,9 @@ AC_CACHE_VAL(test_cv_have_ios_openmode, [ AC_TRY_COMPILE( - [#include <fstream.h> - #include <iomanip.h>], + [#include <fstream> + #include <iomanip> + using namespace std;], [ios::openmode myTest = ios::in;], [test_cv_have_ios_openmode=yes], [test_cv_have_ios_openmode=no] --- sidplay-libs-2.1.1.orig/libsidplay/unix/sidint.h +++ sidplay-libs-2.1.1/libsidplay/unix/sidint.h @@ -0,0 +1,17 @@ +#ifndef _UNIX_SIDINT_H +#define _UNIX_SIDINT_H 1 +#ifndef _GENERATED_STDINT_H +#define _GENERATED_STDINT_H "libsidplay 2.1.1" +/* generated using a gnu compiler version gcc (Debian 4.3-20080219-1) 4.3.0 20080219 (prerelease) [gcc-4_3-branch revision 132456] Copyright (C) 2007 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ + +#include <stdint.h> + + +/* system headers have good uint64_t */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +#endif + + /* once */ +#endif +#endif --- sidplay-libs-2.1.1.orig/libsidutils/include/sidplay/utils/SidUsage.h +++ sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h @@ -33,7 +33,7 @@ uint_least16_t length; // usage scan length // Copy common parts of basic usage to extended usage. - sid2_usage_t &sid2_usage_t::operator= (const sid_usage_t &usage) + sid2_usage_t &operator= (const sid_usage_t &usage) { *((sid_usage_t *) this) = usage; return *this;
shibajee/buildroot
package/libsidplay2/0001-sidplay2-libs-2.1.1.patch
patch
mit
10,693
Include correct libdir in pkgconfig files Downloaded from https://sources.debian.net/src/sidplay-libs/2.1.1-14/debian/patches/pkg-config.patch/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- sidplay-libs-2.1.1.orig/libsidplay/unix/libsidplay2.pc.in +++ sidplay-libs-2.1.1/libsidplay/unix/libsidplay2.pc.in @@ -7,5 +7,5 @@ builders=@builders@ Name: @PACKAGE@ Description: C64 cycle exact stereo sidplayer library. Version: @VERSION@ -Libs: ${libdir}/libsidplay2.la +Libs: -L${libdir} -lsidplay2 Cflags: -DHAVE_UNIX -I${includedir} --- sidplay-libs-2.1.1.orig/libsidutils/unix/libsidutils.pc.in +++ sidplay-libs-2.1.1/libsidutils/unix/libsidutils.pc.in @@ -6,5 +6,5 @@ includedir=@includedir@ Name: @PACKAGE@ Description: Utils for supporting the libsidplay2 library. Version: @VERSION@ -Libs: ${libdir}/libsidutils.la +Libs: -L${libdir} -lsidutils Cflags: -DHAVE_UNIX -I${includedir}
shibajee/buildroot
package/libsidplay2/0002-pkg-config.patch
patch
mit
904
Fix build with gcc6 gcc6 triggers an error during build: xsid.cpp:101:1: error: narrowing conversion of ''\200'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] }; ^ xsid.cpp:101:1: error: narrowing conversion of ''\224'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] xsid.cpp:101:1: error: narrowing conversion of ''\251'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] xsid.cpp:101:1: error: narrowing conversion of ''\274'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] xsid.cpp:101:1: error: narrowing conversion of ''\316'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] xsid.cpp:101:1: error: narrowing conversion of ''\341'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] xsid.cpp:101:1: error: narrowing conversion of ''\362'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] To fix the problem change the array type from int8_t to char as proposed by Khem Raj: http://lists.busybox.net/pipermail/buildroot/2016-August/169540.html Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> diff -uNr sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.cpp sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.cpp --- sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.cpp 2004-06-14 22:08:02.000000000 +0200 +++ sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.cpp 2016-08-12 18:10:20.000000000 +0200 @@ -94,7 +94,7 @@ '\x08', '\x19', '\x2a', '\x3b', '\x4c', '\x5d', '\x6e', '\x7f' }; */ -const int8_t XSID::sampleConvertTable[16] = +const char XSID::sampleConvertTable[16] = { '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03', '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f' diff -uNr sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.h sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.h --- sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.h 2004-06-14 22:08:02.000000000 +0200 +++ sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.h 2016-08-12 18:11:01.000000000 +0200 @@ -238,7 +238,7 @@ uint8_t sidData0x18; bool _sidSamples; int8_t sampleOffset; - static const int8_t sampleConvertTable[16]; + static const char sampleConvertTable[16]; bool wasRunning; private:
shibajee/buildroot
package/libsidplay2/0003-gcc6.patch
patch
mit
2,312
config BR2_PACKAGE_LIBSIDPLAY2 bool "libsidplay2" depends on BR2_INSTALL_LIBSTDCPP help Sidplay 2 is the second in the Sidplay series originally developed by Michael Schwendt. This version is written by Simon White and is cycle accurate for improved sound reproduction. Sidplay 2 is capable of playing all C64 mono and stereo file formats. http://sourceforge.net/projects/sidplay2 comment "libsidplay2 needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP
shibajee/buildroot
package/libsidplay2/Config.in
in
mit
483
# From http://sourceforge.net/projects/sidplay2/files/sidplay2/sidplay-libs-2.1.1/ sha1 8af6350866edc30b0d331e075fa97292f6f645a5 sidplay-libs-2.1.1.tar.gz
shibajee/buildroot
package/libsidplay2/libsidplay2.hash
hash
mit
155
################################################################################ # # libsidplay2 # ################################################################################ LIBSIDPLAY2_VERSION = 2.1.1 LIBSIDPLAY2_SOURCE = sidplay-libs-$(LIBSIDPLAY2_VERSION).tar.gz LIBSIDPLAY2_SITE = http://downloads.sourceforge.net/project/sidplay2/sidplay2/sidplay-libs-$(LIBSIDPLAY2_VERSION) LIBSIDPLAY2_LICENSE = GPLv2+ LIBSIDPLAY2_LICENSE_FILES = libsidplay/COPYING LIBSIDPLAY2_AUTORECONF = YES LIBSIDPLAY2_INSTALL_STAGING = YES $(eval $(autotools-package))
shibajee/buildroot
package/libsidplay2/libsidplay2.mk
mk
mit
556
config BR2_PACKAGE_LIBSIGC bool "libsigc++" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_INSTALL_LIBSTDCPP help libsigc++ implements a typesafe callback system for standard C++. It allows you to define signals and to connect those signals to any callback function, either global or a member function, regardless of whether it is static or virtual. http://libsigc.sourceforge.net/ comment "libsigc++ needs a toolchain w/ C++, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
shibajee/buildroot
package/libsigc/Config.in
in
mit
548
# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.8/libsigc++-2.8.0.sha256sum sha256 774980d027c52947cb9ee4fac6ffe2ca60cc2f753068a89dfd281c83dbff9651 libsigc++-2.8.0.tar.xz
shibajee/buildroot
package/libsigc/libsigc.hash
hash
mit
181
################################################################################ # # libsigc # ################################################################################ LIBSIGC_VERSION_MAJOR = 2.8 LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) LIBSIGC_DEPENDENCIES = host-m4 LIBSIGC_INSTALL_STAGING = YES LIBSIGC_LICENSE = LGPLv2.1+ LIBSIGC_LICENSE_FILES = COPYING define LIBSIGC_INSTALL_TARGET_FIXUP rm -rf $(TARGET_DIR)/usr/share/devhelp/books/libsigc++* endef LIBSIGC_POST_INSTALL_TARGET_HOOKS += LIBSIGC_INSTALL_TARGET_FIXUP $(eval $(autotools-package))
shibajee/buildroot
package/libsigc/libsigc.mk
mk
mit
710
From 83bf4762e42a4d4a5c077f48d8f5715c9147d9b8 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs <aurel@gnuage.org> Date: Mon, 1 Feb 2016 22:37:36 +0100 Subject: [PATCH] beaglelogic: use standard # operator instead of ugly __STRING macro Also note that the __ namespace is reserved by POSIX for its private usage, so user land software should never rely on any kind of API with a __ prefix. Signed-off-by: Aurelien Jacobs <aurel@gnuage.org> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- Patch downloaded from upstream git: http://sigrok.org/gitweb/?p=libsigrok.git;a=commit;h=83bf4762e42a4d4a5c077f48d8f5715c9147d9b8 src/hardware/beaglelogic/beaglelogic.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/hardware/beaglelogic/beaglelogic.h b/src/hardware/beaglelogic/beaglelogic.h index 9015c61..96713ba 100644 --- a/src/hardware/beaglelogic/beaglelogic.h +++ b/src/hardware/beaglelogic/beaglelogic.h @@ -30,8 +30,7 @@ /* BeagleLogic device node name */ #define BEAGLELOGIC_DEV_NODE "/dev/beaglelogic" -#define BEAGLELOGIC_SYSFS_ATTR(a) "/sys/devices/virtual/misc/beaglelogic/"\ - __STRING(a) +#define BEAGLELOGIC_SYSFS_ATTR(a) "/sys/devices/virtual/misc/beaglelogic/" #a /* Reproduced verbatim from beaglelogic.h in the kernel tree until the kernel * module hits the mainline. Contains the ABI, so DO NOT TOUCH this section */ -- 2.6.2
shibajee/buildroot
package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch
patch
mit
1,400
config BR2_PACKAGE_LIBSIGROK bool "libsigrok" select BR2_PACKAGE_LIBZIP select BR2_PACKAGE_LIBGLIB2 # libglib2 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # std=c11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 help Libsigrok is a shared library written in C, which provides the basic hardware access drivers for logic analyzers and other supported devices, as well as input/output file format support. This library is a part of the sigrok software suite. http://sigrok.org/wiki/Libsigrok if BR2_PACKAGE_LIBSIGROK config BR2_PACKAGE_LIBSIGROKCXX bool "build C++ bindings" select BR2_PACKAGE_GLIBMM depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # glibmm help Build libsigrok C++ bindings as well. comment "C++ bindings need a toolchain w/ C++, gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 endif comment "libsigrok needs a toolchain w/ wchar, threads, gcc >= 4.7" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
shibajee/buildroot
package/libsigrok/Config.in
in
mit
1,128
# Locally computed sha256 5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e libsigrok-0.4.0.tar.gz
shibajee/buildroot
package/libsigrok/libsigrok.hash
hash
mit
114
################################################################################ # # libsigrok # ################################################################################ LIBSIGROK_VERSION = 0.4.0 LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok LIBSIGROK_LICENSE = GPLv3+ LIBSIGROK_LICENSE_FILES = COPYING LIBSIGROK_INSTALL_STAGING = YES LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf LIBSIGROK_CONF_OPTS = --disable-glibtest --disable-java --disable-python ifeq ($(BR2_PACKAGE_LIBSERIALPORT),y) LIBSIGROK_CONF_OPTS += --enable-libserialport LIBSIGROK_DEPENDENCIES += libserialport else LIBSIGROK_CONF_OPTS += --disable-libserialport endif ifeq ($(BR2_PACKAGE_LIBFTDI),y) LIBSIGROK_CONF_OPTS += --enable-libftdi LIBSIGROK_DEPENDENCIES += libftdi else LIBSIGROK_CONF_OPTS += --disable-libftdi endif ifeq ($(BR2_PACKAGE_LIBUSB),y) LIBSIGROK_CONF_OPTS += --enable-libusb LIBSIGROK_DEPENDENCIES += libusb else LIBSIGROK_CONF_OPTS += --disable-libusb endif ifeq ($(BR2_PACKAGE_GLIBMM),y) LIBSIGROK_DEPENDENCIES += glibmm endif ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) LIBSIGROK_CONF_OPTS += --enable-cxx LIBSIGROK_AUTORECONF_OPTS += -I $(HOST_DIR)/usr/share/autoconf-archive LIBSIGROK_DEPENDENCIES += \ host-autoconf-archive \ glibmm \ host-doxygen \ $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) else LIBSIGROK_CONF_OPTS += --disable-cxx endif $(eval $(autotools-package))
shibajee/buildroot
package/libsigrok/libsigrok.mk
mk
mit
1,411
config BR2_PACKAGE_LIBSIGROKDECODE bool "libsigrokdecode" select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PYTHON3 depends on !BR2_PACKAGE_PYTHON # python3 depends on BR2_USE_WCHAR # libglib2/python3 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3 depends on BR2_USE_MMU # libglib2/python3 depends on !BR2_STATIC_LIBS # python3 help Libsigrokdecode is a shared library written in C, which provides (streaming) protocol decoding functionality. Say yes here if you want to add this functionality to your buildroot-generated sigrok suite. This library is a part of the sigrok software suite. http://sigrok.org/wiki/Libsigrokdecode comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_PACKAGE_PYTHON depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS comment "libsigrokdecode is not compatible with python" depends on BR2_USE_MMU depends on BR2_PACKAGE_PYTHON
shibajee/buildroot
package/libsigrokdecode/Config.in
in
mit
987
# Locally computed sha256 fd7e9d1b73245e844ead97a16d5321c766196f946c9b28a8646cab2e98ec3537 libsigrokdecode-0.4.0.tar.gz
shibajee/buildroot
package/libsigrokdecode/libsigrokdecode.hash
hash
mit
120
################################################################################ # # libsigrokdecode # ################################################################################ LIBSIGROKDECODE_VERSION = 0.4.0 LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode LIBSIGROKDECODE_LICENSE = GPLv3+ LIBSIGROKDECODE_LICENSE_FILES = COPYING LIBSIGROKDECODE_INSTALL_STAGING = YES LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3 $(eval $(autotools-package))
shibajee/buildroot
package/libsigrokdecode/libsigrokdecode.mk
mk
mit
492
From 790e8f620f06834f3fd03c310cbecd1416536987 Mon Sep 17 00:00:00 2001 From: Will Newton <will.newton@linaro.org> Date: Tue, 28 May 2013 18:31:46 +0100 Subject: [PATCH 2/5] Add stack direction for the AArch64 architecture On this architecture, the stack grows downward. Signed-off-by: Will Newton <will.newton@linaro.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- m4/stack-direction.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 index 39c1a28..3f70530 100644 --- a/m4/stack-direction.m4 +++ b/m4/stack-direction.m4 @@ -13,6 +13,7 @@ AC_DEFUN([SV_STACK_DIRECTION], case "$host_cpu" in dnl See the #define STACK_GROWS_DOWNWARD in gcc-3.1/gcc/config/*/*.h. a29k | \ + aarch64* | \ alpha* | \ arc | \ arm* | strongarm* | xscale* | \ -- 2.1.0
shibajee/buildroot
package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch
patch
mit
875
From f4395ff932758884416753f88f5d98f33ec67479 Mon Sep 17 00:00:00 2001 From: Spenser Gilliland <spenser@gillilanding.com> Date: Mon, 29 Dec 2014 13:54:54 +0100 Subject: [PATCH 3/5] Add stack direction for the Microblaze architecture Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- m4/stack-direction.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 index 3f70530..53f4216 100644 --- a/m4/stack-direction.m4 +++ b/m4/stack-direction.m4 @@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION], m68* | \ m88k | \ mcore | \ + microblaze | \ mips* | \ mmix | \ mn10200 | \ -- 2.1.0
shibajee/buildroot
package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch
patch
mit
758
From 55a707283dbb3b2fdcaaa4e177d050e122cfc2a0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Mon, 29 Dec 2014 13:55:16 +0100 Subject: [PATCH 4/5] Add stack direction for the Blackfin architecture The stack grows downward on Blackfin, see https://sourceware.org/binutils/docs/as/Blackfin-Syntax.html: "The stack grows by decrementing the stack pointer.". Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- m4/stack-direction.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 index 53f4216..1a97d5a 100644 --- a/m4/stack-direction.m4 +++ b/m4/stack-direction.m4 @@ -18,6 +18,7 @@ AC_DEFUN([SV_STACK_DIRECTION], arc | \ arm* | strongarm* | xscale* | \ avr | \ + bfin | \ c1 | c2 | c32 | c34 | c38 | \ clipper | \ cris | \ -- 2.1.0
shibajee/buildroot
package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch
patch
mit
899
From 24bac122bf4ffe437bb4f6ca633ad08f31a23d73 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Mon, 29 Dec 2014 13:56:54 +0100 Subject: [PATCH 5/5] Add stack direction for the Nios II architecture According to Altera Application Binary Interface document for the Nios II architecture (http://www.altera.com/literature/hb/nios2/n2cpu_nii51016.pdf): "The stack grows downward (i.e. towards lower addresses). ". Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- m4/stack-direction.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 index 1a97d5a..d9c5157 100644 --- a/m4/stack-direction.m4 +++ b/m4/stack-direction.m4 @@ -38,6 +38,7 @@ AC_DEFUN([SV_STACK_DIRECTION], mmix | \ mn10200 | \ mn10300 | \ + nios2 | \ ns32k | \ pdp11 | \ pj* | \ -- 2.1.0
shibajee/buildroot
package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch
patch
mit
917
Fix sparc64 build. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> diff -Nur libsigsegv-2.10.orig/src/fault-linux-sparc.h libsigsegv-2.10/src/fault-linux-sparc.h --- libsigsegv-2.10.orig/src/fault-linux-sparc.h 2009-08-01 17:06:49.000000000 +0200 +++ libsigsegv-2.10/src/fault-linux-sparc.h 2015-11-29 11:55:29.000000000 +0100 @@ -27,4 +27,8 @@ (see also <asm/sigcontext.h>) are quite different types. */ +#if __WORDSIZE == 64 +#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.mc_gregs[REG_O6] +#else #define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[REG_O6] +#endif
shibajee/buildroot
package/libsigsegv/0005-fix-sparc64-stackpointer.patch
patch
mit
631
config BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS bool # with glibc/musl, ucontext is available for all supported # architectures default y if BR2_TOOLCHAIN_USES_GLIBC default y if BR2_TOOLCHAIN_USES_MUSL # with uclibc, ucontext is only available for a subset of the # supported architectures default y if BR2_TOOLCHAIN_USES_UCLIBC && \ (BR2_ARM_CPU_HAS_ARM || BR2_i386 || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ BR2_sparc || BR2_x86_64) config BR2_PACKAGE_LIBSIGSEGV bool "libsigsegv" depends on BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS help Library for handling page faults in user mode. http://www.gnu.org/software/libsigsegv/
shibajee/buildroot
package/libsigsegv/Config.in
in
mit
667
# Locally calculated after checking pgp signature sha256 8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a libsigsegv-2.10.tar.gz
shibajee/buildroot
package/libsigsegv/libsigsegv.hash
hash
mit
145
################################################################################ # # libsigsegv # ################################################################################ LIBSIGSEGV_VERSION = 2.10 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes LIBSIGSEGV_LICENSE = GPLv2+ LIBSIGSEGV_LICENSE_FILES = COPYING LIBSIGSEGV_AUTORECONF = YES $(eval $(autotools-package))
shibajee/buildroot
package/libsigsegv/libsigsegv.mk
mk
mit
452
config BR2_PACKAGE_LIBSILK bool "libsilk" help SILK is an audio compression format and audio codec. http://tools.ietf.org/html/draft-vos-silk-01
shibajee/buildroot
package/libsilk/Config.in
in
mit
154
################################################################################ # # libsilk # ################################################################################ LIBSILK_VERSION = 4268a02240c35c6055b0f237c46b09b2dcf79e45 # we use the FreeSwitch fork because it contains pkgconf support LIBSILK_SITE = https://freeswitch.org/stash/scm/sd/libsilk.git LIBSILK_SITE_METHOD = git LIBSILK_LICENSE = BSD-3c LIBSILK_LICENSE_FILES = COPYING LIBSILK_AUTORECONF = YES LIBSILK_INSTALL_STAGING = YES $(eval $(autotools-package))
shibajee/buildroot
package/libsilk/libsilk.mk
mk
mit
532
--- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libsndfile-1.0.18/Makefile.in =================================================================== --- libsndfile-1.0.18.orig/Makefile.in +++ libsndfile-1.0.18/Makefile.in @@ -260,7 +260,7 @@ top_srcdir = @top_srcdir@ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror @BUILD_OCTAVE_MOD_TRUE@octave_dir = Octave -SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs +SUBDIRS = src DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs EXTRA_DIST = libsndfile.spec.in sndfile.pc.in Mingw-make-dist.sh pkgconfigdir = $(libdir)/pkgconfig
shibajee/buildroot
package/libsndfile/0001-srconly.patch
patch
mit
664
config BR2_PACKAGE_LIBSNDFILE bool "libsndfile" help Libsndfile is a C library for reading and writing files containing sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format) through one standard library interface. http://www.mega-nerd.com/libsndfile/
shibajee/buildroot
package/libsndfile/Config.in
in
mit
281
# Locally calculated after checking pgp signature sha256 a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 libsndfile-1.0.27.tar.gz
shibajee/buildroot
package/libsndfile/libsndfile.hash
hash
mit
147
################################################################################ # # libsndfile # ################################################################################ LIBSNDFILE_VERSION = 1.0.27 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPLv2.1+ LIBSNDFILE_LICENSE_FILES = COPYING $(eval $(autotools-package))
shibajee/buildroot
package/libsndfile/libsndfile.mk
mk
mit
397
config BR2_PACKAGE_LIBSOC bool "libsoc" depends on BR2_TOOLCHAIN_HAS_THREADS help libsoc is a C library for interfacing with common SoC peripherals through generic kernel interfaces https://github.com/jackmitch/libsoc comment "libsoc needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS
shibajee/buildroot
package/libsoc/Config.in
in
mit
317
# Locally computed: sha256 8df626bde365b94a805e1c323104c63a7429ec64c9df815cd1d9b9c4b317e066 libsoc-0.8.2.tar.gz
shibajee/buildroot
package/libsoc/libsoc.hash
hash
mit
114
################################################################################ # # libsoc # ################################################################################ LIBSOC_VERSION = 0.8.2 LIBSOC_SITE = $(call github,jackmitch,libsoc,$(LIBSOC_VERSION)) LIBSOC_LICENSE = LGPLv2.1 LIBSOC_LICENSE_FILES = LICENCE LIBSOC_AUTORECONF = YES LIBSOC_INSTALL_STAGING = YES # Install Python 2 bindings ifeq ($(BR2_PACKAGE_PYTHON),y) LIBSOC_DEPENDENCIES += python LIBSOC_CONF_OPTS += --enable-python=2 # Install Python 3 bindings else ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSOC_DEPENDENCIES += python3 LIBSOC_CONF_OPTS += --enable-python=3 else LIBSOC_CONF_OPTS += --disable-python endif $(eval $(autotools-package))
shibajee/buildroot
package/libsoc/libsoc.mk
mk
mit
713
config BR2_PACKAGE_LIBSOCKETCAN bool "libsocketcan" help SocketCAN library to control CAN devices from C code. http://git.pengutronix.de/?p=tools/libsocketcan.git;a=summary
shibajee/buildroot
package/libsocketcan/Config.in
in
mit
182
# Locally calculated sha256 3c83e386c3fa7673141658472ae0b0e2a9f5849bf52fd9f7b22b04fd98ec7b6e libsocketcan-0.0.10.tar.bz2
shibajee/buildroot
package/libsocketcan/libsocketcan.hash
hash
mit
121
################################################################################ # # libsocketcan # ################################################################################ LIBSOCKETCAN_VERSION = 0.0.10 LIBSOCKETCAN_SITE = http://www.pengutronix.de/software/libsocketcan/download LIBSOCKETCAN_SOURCE = libsocketcan-$(LIBSOCKETCAN_VERSION).tar.bz2 LIBSOCKETCAN_INSTALL_STAGING = YES LIBSOCKETCAN_LICENSE = LGPLv2.1+ $(eval $(autotools-package))
shibajee/buildroot
package/libsocketcan/libsocketcan.mk
mk
mit
454
config BR2_PACKAGE_LIBSODIUM bool "libsodium" help A modern and easy-to-use crypto library. http://libsodium.org/
shibajee/buildroot
package/libsodium/Config.in
in
mit
123
# Locally calculated after checking pgp signature sha256 c0f191d2527852641e0a996b7b106d2e04cbc76ea50731b2d0babd3409301926 libsodium-1.0.8.tar.gz
shibajee/buildroot
package/libsodium/libsodium.hash
hash
mit
145
################################################################################ # # libsodium # ################################################################################ LIBSODIUM_VERSION = 1.0.8 LIBSODIUM_SITE = https://download.libsodium.org/libsodium/releases LIBSODIUM_LICENSE = ISC LIBSODIUM_LICENSE_FILES = LICENSE LIBSODIUM_INSTALL_STAGING = YES ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) LIBSODIUM_CONF_OPTS += --disable-pie endif $(eval $(autotools-package)) $(eval $(host-autotools-package))
shibajee/buildroot
package/libsodium/libsodium.mk
mk
mit
508
Various makefile fixes to allow cross compilation Partly ported from http://anonscm.debian.org/cgit/pkg-games/libsoil.git/tree/debian/patches/linking_correctly.patch Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> diff -uNr soil.org/projects/makefile/alternate_Makefile.txt soil/projects/makefile/alternate_Makefile.txt --- soil.org/projects/makefile/alternate_Makefile.txt 2008-07-07 18:13:28.000000000 +0200 +++ soil/projects/makefile/alternate_Makefile.txt 2015-11-07 11:15:04.140106336 +0100 @@ -1,8 +1,8 @@ MAKE = make -CC = gcc -INSTALL_FILE = install -p -o root -g root -m 644 -INSTALL_DIR = install -p -o root -g root -d -LN = ln -s +CC = $(GCC) +INSTALL_FILE = $(INSTALL) -m 644 +INSTALL_DIR = $(INSTALL) -d +LN = ln -sf RM = rm -fv CFLAGS += -c -O2 -Wall LDFLAGS += @@ -23,13 +23,13 @@ all: $(OFILES) lib %.o: %.c - $(CC) $(CFLAGS) $< -o $@ + $(CC) $(CFLAGS) -c -fPIC $< -o $@ lib: $(OFILES) # create static library - ar -cvq $(LIBNAME).a $(OFILES) + $(AR) -cvq $(LIBNAME).a $(OFILES) # create shared library - gcc -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) + $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) -lGL -lm install: $(INSTALL_DIR) $(DESTDIR)/$(INCLUDEDIR)
shibajee/buildroot
package/libsoil/0001-fix-makefile.patch
patch
mit
1,281
config BR2_PACKAGE_LIBSOIL bool "libsoil" depends on BR2_PACKAGE_HAS_LIBGL depends on !BR2_STATIC_LIBS help SOIL is a tiny C library used primarily for uploading textures into OpenGL. http://www.lonesock.net/soil.html comment "libsoil needs an OpenGL backend and a toolchain w/ dynamic library" depends on !BR2_PACKAGE_HAS_LIBGL || BR2_STATIC_LIBS
shibajee/buildroot
package/libsoil/Config.in
in
mit
364
# Locally calculated sha256 a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701 soil.zip
shibajee/buildroot
package/libsoil/libsoil.hash
hash
mit
102
################################################################################ # # libsoil # ################################################################################ LIBSOIL_VERSION = 20080707 LIBSOIL_SOURCE = soil.zip LIBSOIL_SITE = http://www.lonesock.net/files LIBSOIL_INSTALL_STAGING = YES LIBSOIL_DEPENDENCIES = libgl LIBSOIL_LICENSE = Public Domain, MIT LIBSOIL_LICENSE_FILES = src/stb_image_aug.c src/image_helper.c LIBSOIL_MAKEFILE = ../projects/makefile/alternate_Makefile.txt define LIBSOIL_EXTRACT_CMDS $(UNZIP) -d $(@D) $(DL_DIR)/$(LIBSOIL_SOURCE) mv $(@D)/Simple\ OpenGL\ Image\ Library/* $(@D) endef # gnu patch < v2.5.9 doesn't correctly handle spaces in file names, # and we want to patch the 'alternate Makefile.txt' file, so rename # the file (and patch the renamed file) for compatibility with older # distributions define REMOVE_SPACE_FROM_FILENAME cd $(@D)/projects/makefile/ && \ mv "alternate Makefile.txt" alternate_Makefile.txt endef LIBSOIL_POST_EXTRACT_HOOKS += REMOVE_SPACE_FROM_FILENAME define LIBSOIL_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \ -C $(@D)/src endef define LIBSOIL_INSTALL_STAGING_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \ DESTDIR=$(STAGING_DIR) install \ INSTALL=$(INSTALL) \ -C $(@D)/src endef define LIBSOIL_INSTALL_TARGET_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \ DESTDIR=$(TARGET_DIR) install \ INSTALL=$(INSTALL) \ -C $(@D)/src endef $(eval $(generic-package))
shibajee/buildroot
package/libsoil/libsoil.mk
mk
mit
1,517
config BR2_PACKAGE_LIBSOUNDTOUCH bool "libsoundtouch" depends on BR2_INSTALL_LIBSTDCPP help SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files. http://www.surina.net/soundtouch comment "libsoundtouch needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP
shibajee/buildroot
package/libsoundtouch/Config.in
in
mit
362
################################################################################ # # libsoundtouch # ################################################################################ LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1 LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git LIBSOUNDTOUCH_SITE_METHOD = git LIBSOUNDTOUCH_LICENSE = LGPLv2.1+ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT LIBSOUNDTOUCH_AUTORECONF = YES LIBSOUNDTOUCH_INSTALL_STAGING = YES define LIBSOUNDTOUCH_CREATE_CONFIG_M4 mkdir -p $(@D)/config/m4 endef LIBSOUNDTOUCH_POST_PATCH_HOOKS += LIBSOUNDTOUCH_CREATE_CONFIG_M4 $(eval $(autotools-package))
shibajee/buildroot
package/libsoundtouch/libsoundtouch.mk
mk
mit
664
config BR2_PACKAGE_LIBSOUP bool "libsoup" depends on BR2_USE_WCHAR # glib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_SQLITE help libsoup is an HTTP client/server library. It uses GObject and the GLib main loop, to integrate well with GNOME applications. http://live.gnome.org/LibSoup if BR2_PACKAGE_LIBSOUP config BR2_PACKAGE_LIBSOUP_GNOME bool "libsoup-gnome" help Build libsoup-gnome library. config BR2_PACKAGE_LIBSOUP_SSL bool "https support" select BR2_PACKAGE_GLIB_NETWORKING select BR2_PACKAGE_GNUTLS help Enable HTTPS (SSL) support. endif comment "libsoup needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
shibajee/buildroot
package/libsoup/Config.in
in
mit
839
# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.54/libsoup-2.54.1.sha256sum sha256 47b42c232034734d66e5f093025843a5d8cc4b2357c011085a2fd04ef02dd633 libsoup-2.54.1.tar.xz
shibajee/buildroot
package/libsoup/libsoup.hash
hash
mit
178
################################################################################ # # libsoup # ################################################################################ LIBSOUP_VERSION_MAJOR = 2.54 LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPLv2+ LIBSOUP_LICENSE_FILES = COPYING LIBSOUP_INSTALL_STAGING = YES LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \ libglib2 libxml2 sqlite host-intltool ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) LIBSOUP_CONF_OPTS += --with-gnome else LIBSOUP_CONF_OPTS += --without-gnome endif ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y) LIBSOUP_DEPENDENCIES += glib-networking else LIBSOUP_CONF_OPTS += --disable-tls-check endif $(eval $(autotools-package))
shibajee/buildroot
package/libsoup/libsoup.mk
mk
mit
991
config BR2_PACKAGE_LIBSOXR bool "libsoxr" help The SoX Resampler library `libsoxr' performs one-dimensional sample-rate conversion—it may be used, for example, to resample PCM-encoded audio. It aims to give fast and high quality results for any constant (rational or irrational) resampling ratio. Phase-response, preserved bandwidth, aliasing, and rejection level parameters are all configurable; alternatively, simple `preset' configurations may be selected. An experimental, variable-rate resampling mode of operation is also included. http://sourceforge.net/projects/soxr/
shibajee/buildroot
package/libsoxr/Config.in
in
mit
612
# From http://sourceforge.net/projects/soxr/files/ sha1 3b990f91dc8dc08e70626cd5fb90deda0239c211 soxr-0.1.2-Source.tar.xz md5 0866fc4320e26f47152798ac000de1c0 soxr-0.1.2-Source.tar.xz # Locally calculated sha256 54e6f434f1c491388cd92f0e3c47f1ade082cc24327bdc43762f7d1eefe0c275 soxr-0.1.2-Source.tar.xz
shibajee/buildroot
package/libsoxr/libsoxr.hash
hash
mit
308
################################################################################ # # libsoxr # ################################################################################ LIBSOXR_VERSION = 0.1.2 LIBSOXR_SOURCE = soxr-$(LIBSOXR_VERSION)-Source.tar.xz LIBSOXR_SITE = http://downloads.sourceforge.net/project/soxr LIBSOXR_LICENSE = LGPLv2.1+ LIBSOXR_LICENSE_FILES = LICENCE COPYING.LGPL LIBSOXR_INSTALL_STAGING = YES LIBSOXR_CONF_OPTS = -DWITH_OPENMP=OFF ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG) LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=1 else LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=0 endif $(eval $(cmake-package))
shibajee/buildroot
package/libsoxr/libsoxr.mk
mk
mit
628
Add Kodi-specific patch Kodi 15.0 contains an updated version of libsquish: https://github.com/xbmc/xbmc/tree/master/tools/depends/native/libsquish-native The OpenElec project provides a separate tarball including the Kodi- specific patches: http://sources.openelec.tv/devel/libsquish-1.10-openelec.tar.gz This patch contains the relevant diff between upstream libsquish 1.13 and the OpenElec tarball. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> diff -uwNr 1.13/squish.cpp libsquish-1.10-openelec/squish.cpp --- 1.13/squish.cpp 2015-04-30 12:48:49.000000000 +0200 +++ libsquish-1.10-openelec/squish.cpp 2015-01-09 10:58:43.000000000 +0100 @@ -23,6 +23,7 @@ -------------------------------------------------------------------------- */ +#include <string.h> #include <squish.h> #include "colourset.h" #include "maths.h" @@ -39,7 +40,7 @@ // grab the flag bits int method = flags & ( kDxt1 | kDxt3 | kDxt5 ); int fit = flags & ( kColourIterativeClusterFit | kColourClusterFit | kColourRangeFit ); - int extra = flags & kWeightColourByAlpha; + int extra = flags & ( kWeightColourByAlpha | kSourceBGRA ); // set defaults if( method != kDxt3 && method != kDxt5 ) @@ -124,8 +125,30 @@ return blockcount*blocksize; } +void CopyRGBA( u8 const* source, u8* dest, int flags ) +{ + if (flags & kSourceBGRA) + { + // convert from bgra to rgba + dest[0] = source[2]; + dest[1] = source[1]; + dest[2] = source[0]; + dest[3] = source[3]; + } + else + { + for( int i = 0; i < 4; ++i ) + *dest++ = *source++; + } +} + void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric ) { + CompressImage(rgba, width, height, width*4, blocks, flags, metric); +} + +void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric ) +{ // fix any bad flags flags = FixFlags( flags ); @@ -154,20 +177,14 @@ if( sx < width && sy < height ) { // copy the rgba value - u8 const* sourcePixel = rgba + 4*( width*sy + sx ); - for( int i = 0; i < 4; ++i ) - *targetPixel++ = *sourcePixel++; - + u8 const* sourcePixel = rgba + pitch*sy + 4*sx; + CopyRGBA(sourcePixel, targetPixel, flags); // enable this pixel mask |= ( 1 << ( 4*py + px ) ); } - else - { - // skip this pixel as its outside the image targetPixel += 4; } } - } // compress it into the output CompressMasked( sourceRgba, mask, targetBlock, flags, metric ); @@ -180,6 +197,11 @@ void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags ) { + DecompressImage( rgba, width, height, width*4, blocks, flags ); +} + +void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags ) +{ // fix any bad flags flags = FixFlags( flags ); @@ -207,24 +229,132 @@ int sy = y + py; if( sx < width && sy < height ) { - u8* targetPixel = rgba + 4*( width*sy + sx ); + u8* targetPixel = rgba + pitch*sy + 4*sx; // copy the rgba value + CopyRGBA(sourcePixel, targetPixel, flags); + } + sourcePixel += 4; + } + } + + // advance + sourceBlock += bytesPerBlock; + } + } +} + +static double ErrorSq(double x, double y) +{ + return (x - y) * (x - y); +} + +static void ComputeBlockWMSE(u8 const *original, u8 const *compressed, unsigned int w, unsigned int h, double &cmse, double &amse) +{ + // Computes the MSE for the block and weights it by the variance of the original block. + // If the variance of the original block is less than 4 (i.e. a standard deviation of 1 per channel) + // then the block is close to being a single colour. Quantisation errors in single colour blocks + // are easier to see than similar errors in blocks that contain more colours, particularly when there + // are many such blocks in a large area (eg a blue sky background) as they cause banding. Given that + // banding is easier to see than small errors in "complex" blocks, we weight the errors by a factor + // of 5. This implies that images with large, single colour areas will have a higher potential WMSE + // than images with lots of detail. + + cmse = amse = 0; + unsigned int sum_p[4]; // per channel sum of pixels + unsigned int sum_p2[4]; // per channel sum of pixels squared + memset(sum_p, 0, sizeof(sum_p)); + memset(sum_p2, 0, sizeof(sum_p2)); + for( unsigned int py = 0; py < 4; ++py ) + { + for( unsigned int px = 0; px < 4; ++px ) + { + if( px < w && py < h ) + { + double pixelCMSE = 0; + for( int i = 0; i < 3; ++i ) + { + pixelCMSE += ErrorSq(original[i], compressed[i]); + sum_p[i] += original[i]; + sum_p2[i] += (unsigned int)original[i]*original[i]; + } + if( original[3] == 0 && compressed[3] == 0 ) + pixelCMSE = 0; // transparent in both, so colour is inconsequential + amse += ErrorSq(original[3], compressed[3]); + cmse += pixelCMSE; + sum_p[3] += original[3]; + sum_p2[3] += (unsigned int)original[3]*original[3]; + } + original += 4; + compressed += 4; + } + } + unsigned int variance = 0; for( int i = 0; i < 4; ++i ) - *targetPixel++ = *sourcePixel++; + variance += w*h*sum_p2[i] - sum_p[i]*sum_p[i]; + if( variance < 4 * w * w * h * h ) + { + amse *= 5; + cmse *= 5; } - else +} + +void ComputeMSE( u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE ) { - // skip this pixel as its outside the image - sourcePixel += 4; + ComputeMSE(rgba, width, height, width*4, dxt, flags, colourMSE, alphaMSE); +} + +void ComputeMSE( u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE ) +{ + // fix any bad flags + flags = FixFlags( flags ); + colourMSE = alphaMSE = 0; + + // initialise the block input + squish::u8 const* sourceBlock = dxt; + int bytesPerBlock = ( ( flags & squish::kDxt1 ) != 0 ) ? 8 : 16; + + // loop over blocks + for( int y = 0; y < height; y += 4 ) + { + for( int x = 0; x < width; x += 4 ) + { + // decompress the block + u8 targetRgba[4*16]; + Decompress( targetRgba, sourceBlock, flags ); + u8 const* sourcePixel = targetRgba; + + // copy across to a similar pixel block + u8 originalRgba[4*16]; + u8* originalPixel = originalRgba; + + for( int py = 0; py < 4; ++py ) + { + for( int px = 0; px < 4; ++px ) + { + int sx = x + px; + int sy = y + py; + if( sx < width && sy < height ) + { + u8 const* targetPixel = rgba + pitch*sy + 4*sx; + CopyRGBA(targetPixel, originalPixel, flags); } + sourcePixel += 4; + originalPixel += 4; } } + // compute the weighted MSE of the block + double blockCMSE, blockAMSE; + ComputeBlockWMSE(originalRgba, targetRgba, std::min(4, width - x), std::min(4, height - y), blockCMSE, blockAMSE); + colourMSE += blockCMSE; + alphaMSE += blockAMSE; // advance sourceBlock += bytesPerBlock; } } + colourMSE /= (width * height * 3); + alphaMSE /= (width * height); } } // namespace squish diff -uwNr 1.13/squish.h libsquish-1.10-openelec/squish.h --- 1.13/squish.h 2015-04-30 12:55:27.000000000 +0200 +++ libsquish-1.10-openelec/squish.h 2015-01-09 10:58:43.000000000 +0100 @@ -57,7 +57,10 @@ kColourRangeFit = ( 1 << 4 ), //! Weight the colour by alpha during cluster fit (disabled by default). - kWeightColourByAlpha = ( 1 << 7 ) + kWeightColourByAlpha = ( 1 << 7 ), + + //! Source is BGRA rather than RGBA + kSourceBGRA = ( 1 << 9 ), }; // ----------------------------------------------------------------------------- @@ -194,6 +197,7 @@ @param rgba The pixels of the source. @param width The width of the source image. @param height The height of the source image. + @param pitch The pitch of the source image. @param blocks Storage for the compressed output. @param flags Compression flags. @param metric An optional perceptual metric. @@ -231,6 +235,7 @@ to allocate for the compressed output. */ void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 ); +void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 ); // ----------------------------------------------------------------------------- @@ -239,6 +244,7 @@ @param rgba Storage for the decompressed pixels. @param width The width of the source image. @param height The height of the source image. + @param pitch The pitch of the decompressed pixels. @param blocks The compressed DXT blocks. @param flags Compression flags. @@ -254,6 +260,32 @@ Internally this function calls squish::Decompress for each block. */ void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags ); +void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags ); + +// ----------------------------------------------------------------------------- + +/*! @brief Computes MSE of an compressed image in memory. + + @param rgba The original image pixels. + @param width The width of the source image. + @param height The height of the source image. + @param pitch The pitch of the source image. + @param dxt The compressed dxt blocks + @param flags Compression flags. + @param colourMSE The MSE of the colour values. + @param alphaMSE The MSE of the alpha values. + + The colour MSE and alpha MSE are computed across all pixels. The colour MSE is + averaged across all rgb values (i.e. colourMSE = sum sum_k ||dxt.k - rgba.k||/3) + + The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, + however, DXT1 will be used by default if none is specified. All other flags + are ignored. + + Internally this function calls squish::Decompress for each block. +*/ +void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE); +void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE); // ----------------------------------------------------------------------------- diff -uwNr 1.13/squish.pc.in libsquish-1.10-openelec/squish.pc.in --- 1.13/squish.pc 1970-01-01 01:00:00.000000000 +0100 +++ libsquish-1.10-openelec/squish.pc 2015-01-09 10:58:43.000000000 +0100 @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: squish +Description: squish DXT lib +Version: 1.1.3-kodi + +Requires: +Libs: -L${libdir} -L${sharedlibdir} -lsquish +Cflags: -I${includedir}
shibajee/buildroot
package/libsquish/0001-kodi.patch
patch
mit
11,354
config BR2_PACKAGE_LIBSQUISH bool "libsquish" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS help The libSquish library compresses images with the DXT standard (also known as S3TC). This standard is mainly used by OpenGL and DirectX for the lossy compression of RGBA textures. http://sourceforge.net/projects/libsquish comment "libsquish needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
shibajee/buildroot
package/libsquish/Config.in
in
mit
467
# From http://sourceforge.net/projects/libsquish/files sha1 7bcdd7d0f0460a29e25dcdab8dc41a30e58bb366 libsquish-1.13.tgz
shibajee/buildroot
package/libsquish/libsquish.hash
hash
mit
120
################################################################################ # # libsquish # ################################################################################ LIBSQUISH_VERSION = 1.13 LIBSQUISH_SOURCE = libsquish-$(LIBSQUISH_VERSION).tgz LIBSQUISH_SITE = http://downloads.sourceforge.net/project/libsquish LIBSQUISH_INSTALL_STAGING = YES LIBSQUISH_STRIP_COMPONENTS = 0 LIBSQUISH_LICENSE = MIT LIBSQUISH_LICENSE_FILES = README define LIBSQUISH_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef define LIBSQUISH_INSTALL_STAGING_CMDS mkdir -p $(STAGING_DIR)/usr/include mkdir -p $(STAGING_DIR)/usr/lib $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ install PREFIX=/usr INSTALL_DIR=$(STAGING_DIR)/usr $(INSTALL) -D -m 644 $(@D)/squish.pc $(STAGING_DIR)/usr/lib/pkgconfig/squish.pc ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so.0 endef define LIBSQUISH_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/include mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ install PREFIX=/usr INSTALL_DIR=$(TARGET_DIR)/usr ln -sf libsquish.so.0.0 $(TARGET_DIR)/usr/lib/libsquish.so.0 endef $(eval $(generic-package))
shibajee/buildroot
package/libsquish/libsquish.mk
mk
mit
1,241
From f76eb65d008d0c8e06698e4a63a776e91b80155b Mon Sep 17 00:00:00 2001 From: jfigus <foleyj@cisco.com> Date: Tue, 4 Nov 2014 14:54:02 -0500 Subject: [PATCH] Rename SHA1 functions to avoid conflicts with downstream packages. Backported from upstream commit c270245a94ae9a007202754eb8f7ce9e48f97007 and tweaked to apply on top of v1.5.4. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> --- crypto/hash/hmac.c | 20 ++++++++++---------- crypto/hash/hmac_ossl.c | 18 +++++++++--------- crypto/hash/sha1.c | 32 ++++++++++++++++---------------- crypto/include/hmac.h | 4 ++-- crypto/include/sha1.h | 34 +++++++++++++++++----------------- crypto/test/sha1_driver.c | 8 ++++---- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/crypto/hash/hmac.c b/crypto/hash/hmac.c index ddb75ea..4bed61e 100644 --- a/crypto/hash/hmac.c +++ b/crypto/hash/hmac.c @@ -141,11 +141,11 @@ hmac_init(hmac_ctx_t *state, const uint8_t *key, int key_len) { debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, 64)); /* initialize sha1 context */ - sha1_init(&state->init_ctx); + srtp_sha1_init(&state->init_ctx); /* hash ipad ^ key */ - sha1_update(&state->init_ctx, ipad, 64); - memcpy(&state->ctx, &state->init_ctx, sizeof(sha1_ctx_t)); + srtp_sha1_update(&state->init_ctx, ipad, 64); + memcpy(&state->ctx, &state->init_ctx, sizeof(srtp_sha1_ctx_t)); return err_status_ok; } @@ -153,7 +153,7 @@ hmac_init(hmac_ctx_t *state, const uint8_t *key, int key_len) { err_status_t hmac_start(hmac_ctx_t *state) { - memcpy(&state->ctx, &state->init_ctx, sizeof(sha1_ctx_t)); + memcpy(&state->ctx, &state->init_ctx, sizeof(srtp_sha1_ctx_t)); return err_status_ok; } @@ -165,7 +165,7 @@ hmac_update(hmac_ctx_t *state, const uint8_t *message, int msg_octets) { octet_string_hex_string(message, msg_octets)); /* hash message into sha1 context */ - sha1_update(&state->ctx, message, msg_octets); + srtp_sha1_update(&state->ctx, message, msg_octets); return err_status_ok; } @@ -183,7 +183,7 @@ hmac_compute(hmac_ctx_t *state, const void *message, /* hash message, copy output into H */ hmac_update(state, (const uint8_t*)message, msg_octets); - sha1_final(&state->ctx, H); + srtp_sha1_final(&state->ctx, H); /* * note that we don't need to debug_print() the input, since the @@ -193,16 +193,16 @@ hmac_compute(hmac_ctx_t *state, const void *message, octet_string_hex_string((uint8_t *)H, 20)); /* re-initialize hash context */ - sha1_init(&state->ctx); + srtp_sha1_init(&state->ctx); /* hash opad ^ key */ - sha1_update(&state->ctx, (uint8_t *)state->opad, 64); + srtp_sha1_update(&state->ctx, (uint8_t *)state->opad, 64); /* hash the result of the inner hash */ - sha1_update(&state->ctx, (uint8_t *)H, 20); + srtp_sha1_update(&state->ctx, (uint8_t *)H, 20); /* the result is returned in the array hash_value[] */ - sha1_final(&state->ctx, hash_value); + srtp_sha1_final(&state->ctx, hash_value); /* copy hash_value to *result */ for (i=0; i < tag_len; i++) diff --git a/crypto/hash/hmac_ossl.c b/crypto/hash/hmac_ossl.c index f62ce57..2ec8350 100644 --- a/crypto/hash/hmac_ossl.c +++ b/crypto/hash/hmac_ossl.c @@ -163,11 +163,11 @@ hmac_init (hmac_ctx_t *state, const uint8_t *key, int key_len) debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, sizeof(ipad))); /* initialize sha1 context */ - sha1_init(&state->init_ctx); + srtp_sha1_init(&state->init_ctx); state->init_ctx_initialized = 1; /* hash ipad ^ key */ - sha1_update(&state->init_ctx, ipad, sizeof(ipad)); + srtp_sha1_update(&state->init_ctx, ipad, sizeof(ipad)); return (hmac_start(state)); } @@ -192,7 +192,7 @@ hmac_update (hmac_ctx_t *state, const uint8_t *message, int msg_octets) octet_string_hex_string(message, msg_octets)); /* hash message into sha1 context */ - sha1_update(&state->ctx, message, msg_octets); + srtp_sha1_update(&state->ctx, message, msg_octets); return err_status_ok; } @@ -211,8 +211,8 @@ hmac_compute (hmac_ctx_t *state, const void *message, } /* hash message, copy output into H */ - sha1_update(&state->ctx, message, msg_octets); - sha1_final(&state->ctx, H); + srtp_sha1_update(&state->ctx, message, msg_octets); + srtp_sha1_final(&state->ctx, H); /* * note that we don't need to debug_print() the input, since the @@ -222,16 +222,16 @@ hmac_compute (hmac_ctx_t *state, const void *message, octet_string_hex_string((uint8_t*)H, sizeof(H))); /* re-initialize hash context */ - sha1_init(&state->ctx); + srtp_sha1_init(&state->ctx); /* hash opad ^ key */ - sha1_update(&state->ctx, (uint8_t*)state->opad, sizeof(state->opad)); + srtp_sha1_update(&state->ctx, (uint8_t*)state->opad, sizeof(state->opad)); /* hash the result of the inner hash */ - sha1_update(&state->ctx, (uint8_t*)H, sizeof(H)); + srtp_sha1_update(&state->ctx, (uint8_t*)H, sizeof(H)); /* the result is returned in the array hash_value[] */ - sha1_final(&state->ctx, hash_value); + srtp_sha1_final(&state->ctx, hash_value); /* copy hash_value to *result */ for (i = 0; i < tag_len; i++) { diff --git a/crypto/hash/sha1.c b/crypto/hash/sha1.c index c200437..29c2e62 100644 --- a/crypto/hash/sha1.c +++ b/crypto/hash/sha1.c @@ -77,17 +77,17 @@ uint32_t SHA_K2 = 0x8F1BBCDC; /* Kt for 40 <= t <= 59 */ uint32_t SHA_K3 = 0xCA62C1D6; /* Kt for 60 <= t <= 79 */ void -sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) { - sha1_ctx_t ctx; +srtp_sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) { + srtp_sha1_ctx_t ctx; - sha1_init(&ctx); - sha1_update(&ctx, msg, octets_in_msg); - sha1_final(&ctx, hash_value); + srtp_sha1_init(&ctx); + srtp_sha1_update(&ctx, msg, octets_in_msg); + srtp_sha1_final(&ctx, hash_value); } /* - * sha1_core(M, H) computes the core compression function, where M is + * srtp_sha1_core(M, H) computes the core compression function, where M is * the next part of the message (in network byte order) and H is the * intermediate state { H0, H1, ...} (in host byte order) * @@ -99,7 +99,7 @@ sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) { */ void -sha1_core(const uint32_t M[16], uint32_t hash_value[5]) { +srtp_sha1_core(const uint32_t M[16], uint32_t hash_value[5]) { uint32_t H0; uint32_t H1; uint32_t H2; @@ -186,7 +186,7 @@ sha1_core(const uint32_t M[16], uint32_t hash_value[5]) { } void -sha1_init(sha1_ctx_t *ctx) { +srtp_sha1_init(srtp_sha1_ctx_t *ctx) { /* initialize state vector */ ctx->H[0] = 0x67452301; @@ -204,7 +204,7 @@ sha1_init(sha1_ctx_t *ctx) { } void -sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { +srtp_sha1_update(srtp_sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { int i; uint8_t *buf = (uint8_t *)ctx->M; @@ -227,13 +227,13 @@ sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { /* process a whole block */ - debug_print(mod_sha1, "(update) running sha1_core()", NULL); + debug_print(mod_sha1, "(update) running srtp_sha1_core()", NULL); - sha1_core(ctx->M, ctx->H); + srtp_sha1_core(ctx->M, ctx->H); } else { - debug_print(mod_sha1, "(update) not running sha1_core()", NULL); + debug_print(mod_sha1, "(update) not running srtp_sha1_core()", NULL); for (i=ctx->octets_in_buffer; i < (ctx->octets_in_buffer + octets_in_msg); i++) @@ -247,12 +247,12 @@ sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { } /* - * sha1_final(ctx, output) computes the result for ctx and copies it + * srtp_sha1_final(ctx, output) computes the result for ctx and copies it * into the twenty octets located at *output */ void -sha1_final(sha1_ctx_t *ctx, uint32_t *output) { +srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t *output) { uint32_t A, B, C, D, E, TEMP; uint32_t W[80]; int i, t; @@ -339,11 +339,11 @@ sha1_final(sha1_ctx_t *ctx, uint32_t *output) { } - debug_print(mod_sha1, "(final) running sha1_core()", NULL); + debug_print(mod_sha1, "(final) running srtp_sha1_core()", NULL); if (ctx->octets_in_buffer >= 56) { - debug_print(mod_sha1, "(final) running sha1_core() again", NULL); + debug_print(mod_sha1, "(final) running srtp_sha1_core() again", NULL); /* we need to do one final run of the compression algo */ diff --git a/crypto/include/hmac.h b/crypto/include/hmac.h index 875f45c..9fc664e 100644 --- a/crypto/include/hmac.h +++ b/crypto/include/hmac.h @@ -51,8 +51,8 @@ typedef struct { uint8_t opad[64]; - sha1_ctx_t ctx; - sha1_ctx_t init_ctx; + srtp_sha1_ctx_t ctx; + srtp_sha1_ctx_t init_ctx; #ifdef OPENSSL int ctx_initialized; int init_ctx_initialized; diff --git a/crypto/include/sha1.h b/crypto/include/sha1.h index f1744ce..e177af6 100644 --- a/crypto/include/sha1.h +++ b/crypto/include/sha1.h @@ -56,15 +56,15 @@ #include <openssl/evp.h> #include <stdint.h> -typedef EVP_MD_CTX sha1_ctx_t; +typedef EVP_MD_CTX srtp_sha1_ctx_t; /* - * sha1_init(&ctx) initializes the SHA1 context ctx + * srtp_sha1_init(&ctx) initializes the SHA1 context ctx * - * sha1_update(&ctx, msg, len) hashes the len octets starting at msg + * srtp_sha1_update(&ctx, msg, len) hashes the len octets starting at msg * into the SHA1 context * - * sha1_final(&ctx, output) performs the final processing of the SHA1 + * srtp_sha1_final(&ctx, output) performs the final processing of the SHA1 * context and writes the result to the 20 octets at output * * Return values are ignored on the EVP functions since all three @@ -72,18 +72,18 @@ typedef EVP_MD_CTX sha1_ctx_t; * */ -static inline void sha1_init (sha1_ctx_t *ctx) +static inline void srtp_sha1_init (srtp_sha1_ctx_t *ctx) { EVP_MD_CTX_init(ctx); EVP_DigestInit(ctx, EVP_sha1()); } -static inline void sha1_update (sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg) +static inline void srtp_sha1_update (srtp_sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg) { EVP_DigestUpdate(ctx, M, octets_in_msg); } -static inline void sha1_final (sha1_ctx_t *ctx, uint32_t *output) +static inline void srtp_sha1_final (srtp_sha1_ctx_t *ctx, uint32_t *output) { unsigned int len = 0; @@ -97,7 +97,7 @@ typedef struct { uint32_t M[16]; /* message buffer */ int octets_in_buffer; /* octets of message in buffer */ uint32_t num_bits_in_msg; /* total number of bits in message */ -} sha1_ctx_t; +} srtp_sha1_ctx_t; /* * sha1(&ctx, msg, len, output) hashes the len octets starting at msg @@ -110,33 +110,33 @@ void sha1(const uint8_t *message, int octets_in_msg, uint32_t output[5]); /* - * sha1_init(&ctx) initializes the SHA1 context ctx + * srtp_sha1_init(&ctx) initializes the SHA1 context ctx * - * sha1_update(&ctx, msg, len) hashes the len octets starting at msg + * srtp_sha1_update(&ctx, msg, len) hashes the len octets starting at msg * into the SHA1 context * - * sha1_final(&ctx, output) performs the final processing of the SHA1 + * srtp_sha1_final(&ctx, output) performs the final processing of the SHA1 * context and writes the result to the 20 octets at output * */ void -sha1_init(sha1_ctx_t *ctx); +srtp_sha1_init(srtp_sha1_ctx_t *ctx); void -sha1_update(sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg); +srtp_sha1_update(srtp_sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg); void -sha1_final(sha1_ctx_t *ctx, uint32_t output[5]); +srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t output[5]); /* - * The sha1_core function is INTERNAL to SHA-1, but it is declared + * The srtp_sha1_core function is INTERNAL to SHA-1, but it is declared * here because it is also used by the cipher SEAL 3.0 in its key * setup algorithm. */ /* - * sha1_core(M, H) computes the core sha1 compression function, where M is + * srtp_sha1_core(M, H) computes the core sha1 compression function, where M is * the next part of the message and H is the intermediate state {H0, * H1, ...} * @@ -145,7 +145,7 @@ sha1_final(sha1_ctx_t *ctx, uint32_t output[5]); */ void -sha1_core(const uint32_t M[16], uint32_t hash_value[5]); +srtp_sha1_core(const uint32_t M[16], uint32_t hash_value[5]); #endif /* else OPENSSL */ diff --git a/crypto/test/sha1_driver.c b/crypto/test/sha1_driver.c index 6adfad1..2e19479 100644 --- a/crypto/test/sha1_driver.c +++ b/crypto/test/sha1_driver.c @@ -102,7 +102,7 @@ hash_test_case_add(hash_test_case_t **list_ptr, err_status_t sha1_test_case_validate(const hash_test_case_t *test_case) { - sha1_ctx_t ctx; + srtp_sha1_ctx_t ctx; uint32_t hash_value[5]; if (test_case == NULL) @@ -113,9 +113,9 @@ sha1_test_case_validate(const hash_test_case_t *test_case) { if (test_case->data_len > MAX_HASH_DATA_LEN) return err_status_bad_param; - sha1_init(&ctx); - sha1_update(&ctx, test_case->data, test_case->data_len); - sha1_final(&ctx, hash_value); + srtp_sha1_init(&ctx); + srtp_sha1_update(&ctx, test_case->data, test_case->data_len); + srtp_sha1_final(&ctx, hash_value); if (0 == memcmp(test_case->hash, hash_value, 20)) { #if VERBOSE printf("PASSED: reference value: %s\n", -- 2.7.3
shibajee/buildroot
package/libsrtp/0001-Rename-SHA1-functions-to-avoid-conflicts-with-downst.patch
patch
mit
13,491
config BR2_PACKAGE_LIBSRTP bool "libsrtp" help This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel. https://github.com/cisco/libsrtp
shibajee/buildroot
package/libsrtp/Config.in
in
mit
265
# Locally calculated sha256 56a7b521c25134f48faff26b0b1e3d4378a14986a2d3d7bc6fefb48987304ff0 libsrtp-v1.5.4.tar.gz
shibajee/buildroot
package/libsrtp/libsrtp.hash
hash
mit
115
################################################################################ # # libsrtp # ################################################################################ LIBSRTP_VERSION = v1.5.4 LIBSRTP_SITE = $(call github,cisco,libsrtp,$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3c LIBSRTP_LICENSE_FILES = LICENSE ifeq ($(BR2_STATIC_LIBS),y) LIBSRTP_MAKE_OPTS = libsrtp.a else ifeq ($(BR2_SHARED_LIBS),y) LIBSRTP_MAKE_OPTS = shared_library else LIBSRTP_MAKE_OPTS = libsrtp.a shared_library endif # While libsrtp is not using pkg-config itself, it checks if # pkg-config is available to determine whether it should install # libsrtp.pc. Since installing it seems useful, let's depend on # host-pkgconf to make sure pkg-config is installed. LIBSRTP_DEPENDENCIES = host-pkgconf # openssl handling needs libdl support ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --enable-openssl else LIBSRTP_CONF_OPTS += --disable-openssl endif $(eval $(autotools-package))
shibajee/buildroot
package/libsrtp/libsrtp.mk
mk
mit
1,057
config BR2_PACKAGE_LIBSSH bool "libssh" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS # Either OpenSSL or libgcrypt are mandatory depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS && !BR2_PACKAGE_OPENSSL # libgcrypt select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL help libssh is a multiplatform C library implementing the SSHv2 and SSHv1 protocol on client and server side. With libssh, you can remotely execute programs, transfer files, use a secure and transparent tunnel for your remote applications. http://www.libssh.org/ comment "libssh needs a toolchain w/ dynamic library, threads" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
shibajee/buildroot
package/libssh/Config.in
in
mit
753
# from https://red.libssh.org/projects/libssh/files/ md5 05465da8004f3258db946346213209de libssh-0.7.3.tar.xz # Locally calculated after checking signature on uncompressed libssh-0.7.3.tar sha256 26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98 libssh-0.7.3.tar.xz
shibajee/buildroot
package/libssh/libssh.hash
hash
mit
282
################################################################################ # # libssh # ################################################################################ LIBSSH_VERSION = 0.7.3 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://red.libssh.org/attachments/download/195 LIBSSH_LICENSE = LGPLv2.1 LIBSSH_LICENSE_FILES = COPYING LIBSSH_INSTALL_STAGING = YES LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ -DWITH_SERVER=OFF \ -DWITH_EXAMPLES=OFF ifeq ($(BR2_PACKAGE_ZLIB),y) LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON LIBSSH_DEPENDENCIES += zlib else LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON LIBSSH_DEPENDENCIES += libgcrypt else LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSSH_DEPENDENCIES += openssl endif endif $(eval $(cmake-package))
shibajee/buildroot
package/libssh/libssh.mk
mk
mit
914