diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-02-15 20:38:29 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-02-15 20:42:05 -0800 |
| commit | 9a2f67de84605f2a8701bfd0378f1bdf29c1879a (patch) | |
| tree | 9dedcc7e0c2f9a8da948c436a30dfa2ec00f18b2 /libs | |
| parent | 11f7efd3a2e92553519f47a045ed40b4f2b24999 (diff) | |
serdisplib: update to 2.02
Use standard PKG_INSTALL. Added patch to fix compilation with it.
Use PKG_INSTALL_DIR as a result.
Added PKG_BUILD_PARALLEL for faster compilation.
Fixed license information.
Add build depends for libusb as it is needed for compilation.
Various small cleanups.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/serdisplib/Makefile | 36 | ||||
| -rw-r--r-- | libs/serdisplib/patches/001-fix-static-libary-build.patch | 22 | ||||
| -rw-r--r-- | libs/serdisplib/patches/002-allow-1bpp-framebuffer.patch | 8 | ||||
| -rw-r--r-- | libs/serdisplib/patches/010-cross-compile.patch | 101 |
4 files changed, 124 insertions, 43 deletions
diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile index 520b3bf24..07978d01a 100644 --- a/libs/serdisplib/Makefile +++ b/libs/serdisplib/Makefile @@ -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)) diff --git a/libs/serdisplib/patches/001-fix-static-libary-build.patch b/libs/serdisplib/patches/001-fix-static-libary-build.patch deleted file mode 100644 index 5162b0e23..000000000 --- a/libs/serdisplib/patches/001-fix-static-libary-build.patch +++ /dev/null @@ -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 diff --git a/libs/serdisplib/patches/002-allow-1bpp-framebuffer.patch b/libs/serdisplib/patches/002-allow-1bpp-framebuffer.patch index 7bc059eef..ada4281e9 100644 --- a/libs/serdisplib/patches/002-allow-1bpp-framebuffer.patch +++ b/libs/serdisplib/patches/002-allow-1bpp-framebuffer.patch @@ -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 */ diff --git a/libs/serdisplib/patches/010-cross-compile.patch b/libs/serdisplib/patches/010-cross-compile.patch new file mode 100644 index 000000000..339322251 --- /dev/null +++ b/libs/serdisplib/patches/010-cross-compile.patch @@ -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) |