diff options
| -rw-r--r-- | patches/xli-1.17.0/series | 2 | ||||
| -rw-r--r-- | patches/xli-1.17.0/xli-1.17.0-makefile.diff | 37 | ||||
| -rw-r--r-- | patches/xli-1.17.0/xli-1.17.0-varargs.diff | 23 | ||||
| -rw-r--r-- | rules/xli.in | 16 | ||||
| -rw-r--r-- | rules/xli.make | 71 |
5 files changed, 0 insertions, 149 deletions
diff --git a/patches/xli-1.17.0/series b/patches/xli-1.17.0/series deleted file mode 100644 index 053ac93aa..000000000 --- a/patches/xli-1.17.0/series +++ /dev/null @@ -1,2 +0,0 @@ -xli-1.17.0-makefile.diff -p0 -xli-1.17.0-varargs.diff -p0 diff --git a/patches/xli-1.17.0/xli-1.17.0-makefile.diff b/patches/xli-1.17.0/xli-1.17.0-makefile.diff deleted file mode 100644 index 302176cc7..000000000 --- a/patches/xli-1.17.0/xli-1.17.0-makefile.diff +++ /dev/null @@ -1,37 +0,0 @@ -Subject: xli: makefile is not sysroot and generic compiler aware -From: Robert Schwebel <r.schwebel@pengutronix.de> - -Use $(SYSROOT) in front of paths and $(CC) for the compiler. -Additionally, add some required libraries. - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - ---- - -Index: Makefile.std -=================================================================== ---- Makefile.std.orig -+++ Makefile.std -@@ -7,17 +7,17 @@ - - MISC_DEFINES= - --SYSPATHFILE=/usr/lib/X11/Xli --INSTALLDIR=/usr/bin/X11 -+SYSPATHFILE=$(SYSROOT)/usr/lib/X11/Xli -+INSTALLDIR=$(SYSROOT)/usr/bin/X11 - SHELL= /bin/sh - MAKE= make --STD_CC= cc --GCC= gcc -+STD_CC= $(CC) -+GCC= $(CC) - CP= cp - LN= ln -s - RM= rm -f - MV= mv -f --LIBS= -lX11 -lm -+LIBS= -lX11 -lm -ljpeg -lpng -lXext - CFLAGS= -O -DSYSPATHFILE=\"$(SYSPATHFILE)\" $(OPTIONALFLAGS) $(EXTRAFLAGS) - GCCFLAGS= -fstrength-reduce -finline-functions - diff --git a/patches/xli-1.17.0/xli-1.17.0-varargs.diff b/patches/xli-1.17.0/xli-1.17.0-varargs.diff deleted file mode 100644 index 388313449..000000000 --- a/patches/xli-1.17.0/xli-1.17.0-varargs.diff +++ /dev/null @@ -1,23 +0,0 @@ -Subject: xli: use stdargs instead of varargs -From: Robert Schwebel <r.schwebel@pengutronix.de> - -Use stdarg.h instead of varargs.h, which is correct for recent -toolchains. - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - ---- - -Index: rlelib.c -=================================================================== ---- rlelib.c.orig -+++ rlelib.c -@@ -12,7 +12,7 @@ - */ - - #include "xli.h" --#include <varargs.h> -+#include <stdarg.h> - #include <ctype.h> - #include "rle.h" - diff --git a/rules/xli.in b/rules/xli.in deleted file mode 100644 index 93d372d8e..000000000 --- a/rules/xli.in +++ /dev/null @@ -1,16 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_xorg_app - -config XLI - tristate - select LIBPNG - select LIBJPEG - select XORG_LIB_X11 - select XORG_LIB_XEXT - prompt "xli" - help - xli is an image viewer for png and jpeg images. - - STAGING: remove in ptxdist-2016.08.0 - Download sources of 1.17.0 are unclear. diff --git a/rules/xli.make b/rules/xli.make deleted file mode 100644 index 9dc176fe4..000000000 --- a/rules/xli.make +++ /dev/null @@ -1,71 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2007 by Robert Schwebel -# 2010 Michael Olbrich <m.olbrich@pengutronix.de> -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_XLI) += xli - -# -# Paths and names -# -XLI_VERSION := 1.17.0 -XLI_MD5 := 996d8cd0b2be2071332412c6802852e6 -XLI := xli-$(XLI_VERSION) -XLI_SUFFIX := tar.gz -XLI_SOURCE := $(SRCDIR)/$(XLI).$(XLI_SUFFIX) -XLI_DIR := $(BUILDDIR)/$(XLI) - -XLI_URL := \ - http://pantransit.reptiles.org/prog/$(XLI).$(XLI_SUFFIX) \ - ftp://ftp.euro.net/pub/mirrors/FreeBSD/ports/distfiles/$(XLI).$(XLI_SUFFIX) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/xli.extract: - @$(call targetinfo) - @$(call clean, $(XLI_DIR)) - @$(call extract, XLI) - @$(call patchin, XLI) - cd $(XLI_DIR) && ln -sf Makefile.std Makefile - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -XLI_PATH := PATH=$(CROSS_PATH) -XLI_MAKE_ENV := $(CROSS_ENV) EXTRAFLAGS="$(CROSS_CPPFLAGS) $(CROSS_LDFLAGS)" - -XLI_INSTALL_OPT := INSTALLDIR=$(XLI_PKGDIR)/usr/bin install - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/xli.targetinstall: - @$(call targetinfo) - - @$(call install_init, xli) - @$(call install_fixup, xli,PRIORITY,optional) - @$(call install_fixup, xli,SECTION,base) - @$(call install_fixup, xli,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") - @$(call install_fixup, xli,DESCRIPTION,missing) - - @$(call install_copy, xli, 0, 0, 0755, -, /usr/bin/xli) - - @$(call install_finish, xli) - - @$(call touch) - -# vim: syntax=make |