Skip to content

Commit

Permalink
[no ci] Package: simplify quirc-openipc (#1183)
Browse files Browse the repository at this point in the history 
Co-authored-by: Signor Pellegrino <[email protected]>
  • Loading branch information
@viktorxda @flyrouter
viktorxda and flyrouter authored Dec 5, 2023
1 parent 2c9d154 commit 1ee7931
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 142 deletions.
5 changes: 1 addition & 4 deletions general/package/quirc-openipc/Config.in
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
config BR2_PACKAGE_QUIRC_OPENIPC
bool "quirc"
select BR2_PACKAGE_JPEG

This comment has been minimized.

Sign in to view

Copy link
@themactep

themactep Dec 13, 2023

Contributor

these were there for a reason

$ make
Makefile:576: *** libjpeg is in the dependency chain of quirc-openipc that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in.  Stop.
make: *** [Makefile:23: _all] Error 2
select BR2_PACKAGE_LIBJPEG
bool "quirc-openipc"
help
QR codes are a type of high-density matrix barcodes, and quirc is a library for extracting and decoding them from images.

https://github.com/dlbeer/quirc
113 changes: 0 additions & 113 deletions general/package/quirc-openipc/files/qrparse
View file

This file was deleted.

21 changes: 7 additions & 14 deletions general/package/quirc-openipc/quirc-openipc.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,24 @@
#
################################################################################

ifeq ($(LOCAL_DOWNLOAD),y)
QUIRC_OPENIPC_SITE_METHOD = git
QUIRC_OPENIPC_SITE = https://github.com/openipc/quirc
QUIRC_OPENIPC_VERSION = $(shell git ls-remote $(QUIRC_OPENIPC_SITE) HEAD | head -1 | cut -f1)
else
QUIRC_OPENIPC_SITE = https://github.com/openipc/quirc/archive
QUIRC_OPENIPC_SOURCE = master.tar.gz
endif

QUIRC_OPENIPC_DEPENDENCIES += libjpeg
QUIRC_OPENIPC_LICENSE = ISC
QUIRC_OPENIPC_LICENSE_FILES = LICENSE.txt
QUIRC_OPENIPC_DEPENDENCIES = libjpeg
LIBJPEG_CONF_OPTS = --disable-shared

QUIRC_OPENIPC_MAKE_OPTS = \
CC="$(TARGET_CC)" \
AR="$(TARGET_AR)"
CC=$(TARGET_CC) \
AR=$(TARGET_AR) \
LDFLAGS="-s"

define QUIRC_OPENIPC_BUILD_CMDS
$(MAKE) $(QUIRC_OPENIPC_MAKE_OPTS) -C $(@D) all
endef

define QUIRC_OPENIPC_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/qrscan $(TARGET_DIR)/usr/sbin
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(QUIRC_OPENIPC_PKGDIR)files/qrparse
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/qrscan
endef

$(eval $(generic-package))
11 changes: 0 additions & 11 deletions general/package/quirc-openipc/readme.md
View file

This file was deleted.

0 comments on commit 1ee7931

Please sign in to comment.