LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #11354 from neheb/abaskat1 

serdisplib: update to 2.02
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
ef5b6111dd 9a2f67de84
commit
97b8306c7c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 124 additions and 43 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +20
    -16
      libs/serdisplib/Makefile
  2. +0
    -22
      libs/serdisplib/patches/001-fix-static-libary-build.patch
  3. +3
    -5
      libs/serdisplib/patches/002-allow-1bpp-framebuffer.patch
  4. +101
    -0
      libs/serdisplib/patches/010-cross-compile.patch

+ 20
- 16
libs/serdisplib/Makefile View File

@ -1,22 +1,24 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=serdisplib
PKG_VERSION:=2.01
PKG_VERSION:=2.02
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/serdisplib
PKG_HASH:=a0a4eb6339de33f694e8eec1731bbe31789493434f747998a8788c2d0e6c324b
PKG_LICENSE:=GPL-2.0
PLG_LICENSE_FILES:=COPYING
PKG_HASH:=447b74007dc157b0378044245649850b26432b9185b6540ff681fcb0765c4d8b
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0-or-later
PLG_LICENSE_FILES:=COPYING
PKG_FIXUP:=libtool
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=libusb-compat
include $(INCLUDE_DIR)/package.mk
CONFIGURE_ARGS += --enable-dynloading --disable-statictools
define Package/serdisplib
SECTION:=libs
CATEGORY:=Libraries
@ -49,27 +51,29 @@ define Package/serdisplib-tools/description
* touchscreen_tool
endef
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
--enable-dynloading \
--disable-statictools
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/serdisplib
$(CP) $(PKG_BUILD_DIR)/include/serdisplib/*.h $(1)/usr/include/serdisplib
$(CP) $(PKG_INSTALL_DIR)/usr/include/serdisplib/*.h $(1)/usr/include/serdisplib
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/*.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libserdisp.{a,so*} $(1)/usr/lib/
endef
define Package/serdisplib/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/*.so* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libserdisp.so* $(1)/usr/lib/
endef
define Package/serdisplib-tools/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/l4m132c_tool $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/l4m320t_tool $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/multidisplay $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/sdcmegtron_tool $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/touchscreen_tool $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/l4m132c_tool $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/l4m320t_tool $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/multidisplay $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sdcmegtron_tool $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/touchscreen_tool $(1)/usr/bin
endef
$(eval $(call BuildPackage,serdisplib))


+ 0
- 22
libs/serdisplib/patches/001-fix-static-libary-build.patch View File

@ -1,22 +0,0 @@
Index: serdisplib-2.01/src/Makefile.in
===================================================================
--- serdisplib-2.01.orig/src/Makefile.in
+++ serdisplib-2.01/src/Makefile.in
@@ -28,7 +28,7 @@ includedir = @includedir@
datarootdir = @datarootdir@
CC=@CC@
-AR=@AR@ -r
+AR=@AR@
LN_S=@LN_S@
INSTALL=@INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -180,7 +180,7 @@ programs: $(PROGRAMS)
$(LIB_DIR)/$(LIB_STATIC): $(LIB_OBJECTS)
$(top_srcdir)/mkinstalldirs $(top_srcdir)/lib
- $(AR) $(LIB_DIR)/$(LIB_STATIC) $(LIB_OBJECTS)
+ $(AR) -r -- $(LIB_DIR)/$(LIB_STATIC) $(LIB_OBJECTS)
$(LIB_DIR)/$(LIB_SHARED): $(LIB_OBJECTS)
$(top_srcdir)/mkinstalldirs $(top_srcdir)/lib

+ 3
- 5
libs/serdisplib/patches/002-allow-1bpp-framebuffer.patch View File

@ -1,8 +1,6 @@
Index: serdisplib-2.01/src/serdisp_specific_framebuffer.c
===================================================================
--- serdisplib-2.01.orig/src/serdisp_specific_framebuffer.c
+++ serdisplib-2.01/src/serdisp_specific_framebuffer.c
@@ -306,13 +306,15 @@ serdisp_t* serdisp_framebuffer_setup(con
--- a/src/serdisp_specific_framebuffer.c
+++ b/src/serdisp_specific_framebuffer.c
@@ -312,13 +312,15 @@ serdisp_t* serdisp_framebuffer_setup(con
if (fb_success) {
/* check if colour mode is supported */


+ 101
- 0
libs/serdisplib/patches/010-cross-compile.patch View File

@ -0,0 +1,101 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,8 +44,8 @@ all:
done && test -z "$$fail"
install:
- $(top_srcdir)/mkinstalldirs $(libdir)/pkgconfig
- $(INSTALL_DATA) serdisplib.pc $(libdir)/pkgconfig/
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
+ $(INSTALL_DATA) serdisplib.pc $(DESTDIR)$(libdir)/pkgconfig/
@for dir in ${subdirs}; do \
(cd $(srcdir) && cd $$dir && $(MAKE) install) \
|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -102,9 +102,9 @@ distclean: clean
install: $(PROGRAMS)
- $(top_srcdir)/mkinstalldirs $(bindir)
- $(top_srcdir)/mkinstalldirs $(sbindir)
- $(top_srcdir)/mkinstalldirs $(sysconfdir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
list='$(PROGRAMS_SBIN)'; \
for prog in $$list; do \
$(INSTALL_PROGRAM) $$prog $(sbindir)/ ; \
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -28,7 +28,7 @@ includedir = @includedir@
datarootdir = @datarootdir@
CC=@CC@
-AR=@AR@ -r
+AR=@AR@
LN_S=@LN_S@
INSTALL=@INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -184,14 +184,14 @@ programs: $(PROGRAMS)
$(CC) $(CFLAGS) $(DEFINES) -c $<
$(LIB_DIR)/$(LIB_STATIC): $(LIB_OBJECTS)
- $(top_srcdir)/mkinstalldirs $(top_srcdir)/lib
- $(AR) $(LIB_DIR)/$(LIB_STATIC) $(LIB_OBJECTS)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(top_srcdir)/lib
+ $(AR) -r -- $(LIB_DIR)/$(LIB_STATIC) $(LIB_OBJECTS)
$(LIB_DIR)/$(LIB_SHARED): $(LIB_OBJECTS)
- $(top_srcdir)/mkinstalldirs $(top_srcdir)/lib
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(top_srcdir)/lib
$(CC) -fPIC -shared $(SONAME_FLAG) -o $(LIB_DIR)/$(LIB_SHARED) $(LIB_OBJECTS) $(LDFLAGS) $(EXTRA_LIBS)
- cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
- cd $(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
+ cd $(DESTDIR)$(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
+ cd $(DESTDIR)$(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
testserdisp: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
$(CC) -o testserdisp $(OBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
@@ -204,20 +204,20 @@ distclean: clean
/bin/rm -f Makefile
install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC)
- $(top_srcdir)/mkinstalldirs $(bindir)
- $(top_srcdir)/mkinstalldirs $(libdir)
- $(top_srcdir)/mkinstalldirs $(includedir)
- $(top_srcdir)/mkinstalldirs $(includedir)/serdisplib
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/serdisplib
- $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)/
- $(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(libdir)/
- $(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(libdir)/
+ $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/
+ $(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/
+ $(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/
list='$(LIB_HEADERFILES)'; \
for headerfile in $$list; do \
- $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(includedir)/serdisplib/ ; \
+ $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \
done
- cd $(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
- cd $(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
+ cd $(DESTDIR)$(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
+ cd $(DESTDIR)$(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
uninstall:
-/bin/rm -f $(libdir)/libserdisp*
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -151,7 +151,7 @@ distclean: clean
install: $(PROGRAMS)
list='$(PROGRAMS)'; \
for prog in $$list; do \
- $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \
+ $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \
done
uninstall: $(PROGRAMS)

Write Preview
Loading…
Cancel
Save