diff options
55 files changed, 74 insertions, 108 deletions
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index 9958af8d5..aa7f1d5fb 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -322,7 +322,7 @@ int main() { char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd; char *pkg_name, *pkg_depends, *pkg_depends_system, *pkg_section, *pkg_descr, *pkg_url; char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt; - char *pkg_need_cxx, *pkgname, *sysname, *pkg_debug; + char *pkgname, *sysname, *pkg_debug; char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name; char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname; char *saveptr, *p_ptr, *s_ptr, *pkg_helper, *sname, *sname2; @@ -349,7 +349,6 @@ int main() { pkg_cxx = NULL; pkg_dflt = NULL; pkg_cfline = NULL; - pkg_need_cxx = NULL; pkgname = NULL; sysname = NULL; pkg_helper = NULL; @@ -554,8 +553,6 @@ int main() { continue; if ((parse_var(buf, "PKG_CXX", NULL, &pkg_cxx)) == 0) continue; - if ((parse_var(buf, "PKG_NEED_CXX", NULL, &pkg_need_cxx)) == 0) - continue; if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0) continue; if ((parse_var_with_system(buf, "PKG_DEPENDS_", pkg_depends_system, &pkg_depends_system, &sysname, 12)) == 0) @@ -1144,7 +1141,6 @@ int main() { free(packages); packages = NULL; - pkg_need_cxx = NULL; /* reset flags, free memory */ free(pkg_name); free(pkg_libname); diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index dc42ebe55..4979c76af 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -10,11 +10,11 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 8134257e3fbb43cc06fb32a6d725d3d0 PKG_DESCR:= image processing and converting utility PKG_SECTION:= multimedia -PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig libiconv-tiny libtool e2fsprogs -PKG_BUILDDEP+= pango +PKG_DEPENDS:= libstdcxx +PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig libiconv-tiny +PKG_BUILDDEP+= pango libtool e2fsprogs PKG_URL:= http://www.imagemagick.org/ PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= libimagemagic PKG_OPTS:= dev @@ -23,7 +23,7 @@ PKG_ARCH_DEPENDS:= !m68k PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK PKGSD_LIBIMAGEMAGICK:= imagemagick library PKGSC_LIBIMAGEMAGICK:= libs -PKGSS_LIBIMAGEMAGICK:= libjpeg libtiff +PKGSS_LIBIMAGEMAGICK:= libjpeg-turbo libtiff libpng PKGSD_CONVERT:= image processing and converting utility PKGSC_CONVERT:= multimedia PKGSS_CONVERT:= libimagemagick @@ -41,7 +41,6 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= ac_cv_sys_file_offset_bits=yes CONFIGURE_ARGS+= --with-magick-plus-plus=no \ --without-gslib \ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 5dd0c39e9..e3db5762f 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -11,14 +11,13 @@ PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315 PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat -PKG_DEPENDS+= libxml2 libxml2-python +PKG_DEPENDS+= libxml2 libxml2-python libstdcxx PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes PKG_BUILDDEP+= libXxf86vm libdrm dri2proto glproto expat libXext PKG_BUILDDEP+= eudev dri3proto presentproto xcb-proto libxcb PKG_BUILDDEP+= libxshmfence PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_SUBVER}/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= mesalib PKG_OPTS:= dev diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index d3204c311..12025b50b 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -9,12 +9,11 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a PKG_DESCR:= open source PBX PKG_SECTION:= phone -PKG_DEPENDS:= libncurses libpthread libopenssl libcurl +PKG_DEPENDS:= libncurses libpthread libopenssl libcurl libstdcxx PKG_BUILDDEP:= ncurses openssl zlib curl popt gtk+ PKG_URL:= http://www.asterisk.org/ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_NOPARALLEL:= 1 -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/avahi/Makefile b/package/avahi/Makefile index c8299f775..453555e90 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -9,11 +9,11 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 2f22745b8f7368ad5a0a3fddac343f2d PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp +PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= autotool libdaemon expat gdbm glib PKG_BUILDDEP+= gettext-tiny gtk+ dbus PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= libavahi PKG_OPTS:= dev diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile index 24b6410ca..4d2af4e8c 100644 --- a/package/beecrypt/Makefile +++ b/package/beecrypt/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 8441c014170823f2dff97e33df55af1e PKG_DESCR:= cryptography toolkit library PKG_SECTION:= libs +PKG_DEPENDS:= libstdcxx PKG_URL:= http://beecrypt.sourceforge.net/ PKG_SITES:= http://sourceforge.net/projects/beecrypt/files/beecrypt/$(PKG_VERSION)/ -PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/bind/Makefile b/package/bind/Makefile index c9dafb891..1cedc9b5b 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -9,11 +9,10 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 207477c4cf95f2db5be0ded8a22669e0 PKG_DESCR:= popular DNS server PKG_SECTION:= dns -PKG_DEPENDS:= libopenssl libbind libxml2 +PKG_DEPENDS:= libopenssl libbind libxml2 libstdcxx PKG_BUILDDEP:= openssl libxml2 PKG_URL:= https://www.isc.org/software/bind/ PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= libbind PKG_OPTS:= dev diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index 1d601813b..a62272650 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -7,13 +7,12 @@ PKG_NAME:= bogofilter PKG_VERSION:= 1.2.2 PKG_RELEASE:= 2 PKG_MD5SUM:= 39d27c13eae8a5064d68e20d585e60de -PKG_DESCR:= mail filter +PKG_DESCR:= mail filter software PKG_SECTION:= mail PKG_BUILDDEP:= libiconv-tiny db -PKG_DEPENDS:= libdb +PKG_DEPENDS:= libdb libstdcxx PKG_URL:= http://bogofilter.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/} -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index fce7e9a2e..829a0d82f 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -13,6 +13,13 @@ config ADK_PACKAGE_BUSYBOX WWW: http://www.busybox.net +config ADK_PACKAGE_BUSYBOX_HIDE + prompt "hide packages provided by busybox applets" + boolean + default y + help + Do not show packages which are provided as busybox applets + menu "Busybox Configuration" depends on ADK_PACKAGE_BUSYBOX source "package/busybox/config/Config.in" diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index 3e18ec935..1bbdbc6aa 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= core PKG_BUILDDEP:= gmp autotool PKG_URL:= http://www.gnu.org/software/coreutils/ PKG_SITES:= http://ftp.gnu.org/gnu/coreutils/ +PKG_BB:= 1 include $(TOPDIR)/mk/package.mk diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index 3a4711fd1..95a792301 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= p2p +PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= openssl PKG_URL:= http://www.rahul.net/dholmes/ctorrent PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dtorrent/} -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/cups/Makefile b/package/cups/Makefile index 5c39f054c..0272d30e6 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -9,11 +9,10 @@ PKG_RELEASE:= 4 PKG_MD5SUM:= 55277c40fd4b7183dc3671d39c5c42b7 PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net/misc -PKG_DEPENDS:= zlib libpthread +PKG_DEPENDS:= zlib libpthread libstdcxx PKG_BUILDDEP:= cups-host zlib PKG_URL:= http://www.cups.org/ PKG_SITES:= http://www.cups.org/software/${PKG_VERSION}/ -PKG_NEED_CXX:= 1 PKG_OPTS:= dev PKG_NOPARALLEL:= 1 diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index df140ecf8..f28d82f4f 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -8,10 +8,10 @@ PKG_VERSION:= 2.2.1 PKG_RELEASE:= 2 PKG_MD5SUM:= aab00068ae5237435b37ac86f2ac7576 PKG_DESCR:= collection of general-purpose C++ classes +PKG_DEPENDS:= libstdcxx PKG_SECTION:= libs PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ -PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 77d87e97e..5264f7d7b 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -13,7 +13,6 @@ PKG_DEPENDS:= libpcre zlib PKG_BUILDDEP:= pcre zlib PKG_URL:= http://dansguardian.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dansguardian/} -PKG_NEED_CXX:= 1 PKG_CXX:= DANSGUARDIAN DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/db/Makefile b/package/db/Makefile index 3ca6f0f4a..4c73488db 100644 --- a/package/db/Makefile +++ b/package/db/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 3fda0b004acdaa6fa350bfc41a3b95ca PKG_DESCR:= disk file format database which stores key/data-pairs in single files PKG_SECTION:= libs +PKG_DEPENDS:= libstdcxx PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db PKG_SITES:= http://www.openadk.org/distfiles/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= libdb PKG_OPTS:= dev diff --git a/package/dillo/Makefile b/package/dillo/Makefile index e3b19a0f3..e63857e16 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -14,7 +14,6 @@ PKG_DEPENDS+= libstdcxx libpthread libopenssl PKG_BUILDDEP:= fltk libXi libiconv-tiny libjpeg-turbo libpng zlib openssl PKG_URL:= http://www.dillo.org/ PKG_SITES:= http://www.dillo.org/download/ -PKG_NEED_CXX:= 1 PKG_HOST_DEPENDS:= !cygwin PKG_ARCH_DEPENDS:= x86 x86_64 mips arm diff --git a/package/findutils/Makefile b/package/findutils/Makefile index 350ad0b0a..7e1919451 100644 --- a/package/findutils/Makefile +++ b/package/findutils/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= autotool HOST_BUILDDEP:= autotool PKG_URL:= http://www.gnu.org/software/findutils/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/findutils/ +PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/firefox/Makefile b/package/firefox/Makefile index c7124d632..a84e0b080 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -20,7 +20,6 @@ PKG_BUILDDEP+= zip-host PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ PKG_NOPARALLEL:= 1 -PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= arm x86 x86_64 mips PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin diff --git a/package/fltk/Makefile b/package/fltk/Makefile index e488912d5..d7097fa7c 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -13,7 +13,6 @@ PKG_DEPENDS:= mesalib libx11 libxi freeglut libfreetype PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype PKG_URL:= http://www.fltk.org/ PKG_SITES:= http://openadk.org/distfiles/ -PKG_NEED_CXX:= 1 PKG_CXX:= LIBFLTK PKG_LIBNAME:= libfltk PKG_OPTS:= dev diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index a93f09228..0b9ec90bf 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -9,11 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 918ffbddcffbac83c218bc52355b6d5a PKG_DESCR:= OpenGL Utility Toolkit libraries PKG_SECTION:= libs -PKG_DEPENDS:= libglu +PKG_DEPENDS:= libglu libstdcxx PKG_BUILDDEP:= glu PKG_URL:= http://freeglut.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/} -PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index b243727f8..22f24d54a 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= bd7c2a9d23b573db467e39833f12103d PKG_DESCR:= pixbuf library PKG_SECTION:= libs +PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= libjpeg-turbo libtiff HOST_BUILDDEP:= glib-host PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/ -PKG_NEED_CXX:= 1 PKG_OPTS:= dev include $(TOPDIR)/mk/host.mk diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index dacdf2aa5..97bc105e9 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -10,12 +10,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 5fbbfb7637bbd571a572a2dae0e736d2 PKG_DESCR:= GTK+ library PKG_SECTION:= libs -PKG_DEPENDS:= glib +PKG_DEPENDS:= glib libstdcxx PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender PKG_BUILDDEP+= gdk-pixbuf libXcomposite libXdamage PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= libgtk PKG_OPTS:= dev diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index b727068b3..650a8ae0e 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -7,13 +7,12 @@ PKG_NAME:= id3lib PKG_VERSION:= 3.8.3 PKG_RELEASE:= 2 PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7 -PKG_DESCR:= An ID3v1/ID3v2 tagging library +PKG_DESCR:= ID3v1/ID3v2 tagging library PKG_SECTION:= libs PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib libiconv-tiny PKG_URL:= http://id3lib.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/} -PKG_NEED_CXX:= 1 PKG_CXX:= ID3LIB PKG_OPTS:= dev diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 6c910592c..4cde89a6d 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -12,7 +12,6 @@ PKG_SECTION:= net PKG_DEPENDS:= libpthread PKG_URL:= http://sourceforge.net/projects/iperf PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} -PKG_NEED_CXX:= 1 PKG_CXX:= IPERF DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 13f934b12..d06081e04 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -9,11 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 710296fe424a49344e5fcc0d09e53317 PKG_DESCR:= low-level packet creation library PKG_SECTION:= libs -PKG_DEPENDS:= libpcap +PKG_DEPENDS:= libpcap libstdcxx PKG_BUILDDEP:= libpcap autotool PKG_URL:= http://sourceforge.net/projects/libnet-dev/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/} -PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/libnotify/Makefile b/package/libnotify/Makefile index a1ca81c7d..221b1173b 100644 --- a/package/libnotify/Makefile +++ b/package/libnotify/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 472e2c1f808848365572a9b024d9e8f5 PKG_DESCR:= notify library PKG_SECTION:= libs +PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= gtk+ dbus-glib PKG_URL:= http://www.galago-project.org/ PKG_SITES:= http://www.galago-project.org/files/releases/source/libnotify/ -PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index ebfebcaf3..39d2f3684 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -2,20 +2,20 @@ # material, please see the LICENCE file in the top-level directory. include ${TOPDIR}/rules.mk + ifeq ($(ADK_TARGET_LIB_GLIBC),y) include ${TOPDIR}/toolchain/glibc/Makefile.inc else ifeq ($(ADK_TARGET_LIB_MUSL),y) include ${TOPDIR}/toolchain/musl/Makefile.inc -else -include ${TOPDIR}/toolchain/uclibc/Makefile.inc endif +ifeq ($(ADK_TARGET_LIB_UCLIBC),y) +include ${TOPDIR}/toolchain/uclibc/Makefile.inc endif PKG_NAME:= libstdcxx PKG_DESCR:= C++ support library PKG_SECTION:= libs -PKG_NEED_CXX:= 1 NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index d577220ca..e9e3c66c0 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -8,10 +8,10 @@ PKG_VERSION:= 3.9.4 PKG_RELEASE:= 4 PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6 PKG_DESCR:= library for reading/writing TIFF images +PKG_DEPENDS:= libstdcxx PKG_SECTION:= libs PKG_URL:= http://www.libtiff.org/ PKG_SITES:= ftp://ftp.remotesensing.org/pub/libtiff/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= libtiff PKG_OPTS:= dev @@ -25,7 +25,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-cxx \ --disable-rpath diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 3c5a2573d..291590908 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -9,12 +9,11 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 9667bf6f9310b957254fdcf6596600b7 PKG_DESCR:= XSLT Library PKG_SECTION:= libs -PKG_DEPENDS:= libxml2 +PKG_DEPENDS:= libxml2 libstdcxx PKG_BUILDDEP:= autotool libxml2 HOST_BUILDDEP:= libxml2-host PKG_URL:= http://xmlsoft.org/XSLT PKG_SITES:= http://xmlsoft.org/sources/ -PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 08a27154e..0f8bf77f9 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -14,7 +14,6 @@ PKG_FDEPENDS:= glib libstdcxx libiconv-tiny libmpdclient librt PKG_BUILDDEP:= glib libmpdclient PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ -PKG_NEED_CXX:= 1 PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index ef7921c6e..9b39f4f08 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -10,7 +10,6 @@ PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b PKG_DESCR:= IPv6 multicast routing daemon PKG_SECTION:= ipv6 PKG_SITES:= http://www.openadk.org/distfiles/ -PKG_NEED_CXX:= 1 PKG_CXX:= MRD6 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 645fd3e6c..0e105ed83 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -13,7 +13,6 @@ PKG_DEPENDS:= libdnet libpcap libpcre libstdcxx PKG_BUILDDEP:= libdnet libpcap pcre PKG_URL:= http://nmap.org/ PKG_SITES:= http://download.insecure.org/nmap/dist/ -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 391b7a832..ef5f63be8 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -7,13 +7,12 @@ PKG_NAME:= openldap PKG_VERSION:= 2.4.39 PKG_RELEASE:= 1 PKG_MD5SUM:= b0d5ee4b252c841dec6b332d679cf943 -PKG_DESCR:= OpenLDAP client libraries +PKG_DESCR:= LDAP client libraries PKG_SECTION:= libs -PKG_DEPENDS:= libopenssl libsasl2 libdb libpthread libuuid +PKG_DEPENDS:= libopenssl libsasl2 libdb libpthread libuuid libstdcxx PKG_BUILDDEP:= cyrus-sasl openssl db util-linux PKG_URL:= http://www.openldap.org/ PKG_SITES:= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= libopenldap PKG_OPTS:= dev diff --git a/package/pango/Makefile b/package/pango/Makefile index e13760d08..0d5199432 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -9,11 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d9532826e95bdb374355deebc42441bb PKG_DESCR:= library for laying out and rendering of text PKG_SECTION:= libs +PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= libXft glib cairo harfbuzz libstdcxx fontconfig HOST_BUILDDEP:= cairo-host harfbuzz-host PKG_URL:= http://www.pango.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.36/} -PKG_NEED_CXX:= 1 PKG_OPTS:= dev ifeq ($(ADK_STATIC),y) diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile index 5d662f20f..2c3fdd3a9 100644 --- a/package/pcrepp/Makefile +++ b/package/pcrepp/Makefile @@ -7,14 +7,13 @@ PKG_NAME:= pcrepp PKG_VERSION:= 0.9.5 PKG_RELEASE:= 2 PKG_MD5SUM:= 1fe6ea8e23ece01fde2ce5fb4746acc2 -PKG_DESCR:= Cpp Wrapper classes for PCRE +PKG_DESCR:= cpp wrapper classes for PCRE PKG_SECTION:= libs -PKG_URL:= http://www.daemon.de/PCRE -PKG_SITES:= http://www.daemon.de/idisk/Apps/pcre++/ PKG_DEPENDS:= libpcre PKG_BUILDDEP:= pcre -PKG_NEED_CXX:= 1 -PKG_CXX:= pcrepp +PKG_URL:= http://www.daemon.de/PCRE +PKG_SITES:= http://www.daemon.de/idisk/Apps/pcre++/ +PKG_CXX:= PCREPP PKG_OPTS:= dev PKG_LIBC_DEPENDS:= glibc musl diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index df1460a75..e6cd52477 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -9,11 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 45ad197eb9b5a840c0f65e3a8131921c PKG_DESCR:= x-term with unicode support PKG_SECTION:= x11/apps -PKG_DEPENDS:= libx11 fontconfig libxft libxml2 gdk-pixbuf +PKG_DEPENDS:= libx11 fontconfig libxft libxml2 gdk-pixbuf libstdcxx PKG_BUILDDEP:= libX11 fontconfig libXft libxml2 gdk-pixbuf PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/ -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index 074fd6a6a..b3e7a9a36 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -7,13 +7,12 @@ PKG_NAME:= sdl-image PKG_VERSION:= 1.2.10 PKG_RELEASE:= 2 PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628 -PKG_DESCR:= simple directMedia layer image library +PKG_DESCR:= simple directmedia layer image library PKG_SECTION:= libs -PKG_DEPENDS:= libpng libtiff libjpeg-turbo libsdl -PKG_BUILDDEP:= sdl-image-host libpng libtiff libjpeg-turbo sdl +PKG_DEPENDS:= libpng libtiff libjpeg-turbo libsdl libstdcxx +PKG_BUILDDEP:= libpng libtiff libjpeg-turbo sdl PKG_URL:= http://www.libsdl.org/ PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/ -PKG_NEED_CXX:= 1 PKG_LIBNAME:= libsdl-image PKG_OPTS:= dev diff --git a/package/squid/Makefile b/package/squid/Makefile index d689b5fd0..c6be547fe 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -13,7 +13,6 @@ PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl PKG_BUILDDEP:= autotool openssl libtool PKG_URL:= http://www.squid-cache.org/ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.4/ -PKG_NEED_CXX:= 1 PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 524f4d31f..6e44f7cf8 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -9,11 +9,10 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= febe799675c1b8b2f7259bad30cf6f23 PKG_DESCR:= small C++ application server PKG_SECTION:= www -PKG_DEPENDS:= cxxtools zlib libpthread +PKG_DEPENDS:= cxxtools zlib libpthread libstdcxx PKG_BUILDDEP:= cxxtools zlib PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/tslib/Makefile b/package/tslib/Makefile index e8237137e..d9f0df29a 100644 --- a/package/tslib/Makefile +++ b/package/tslib/Makefile @@ -10,10 +10,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 9563faf5cf9f111538b4f45778e7bb24 PKG_DESCR:= touchscreen library PKG_SECTION:= libs +PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= autotool PKG_URL:= http://tslib.berlios.de/ PKG_SITES:= http://openadk.org/distfiles/ -PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/twm/Makefile b/package/twm/Makefile index 45c30aba4..a55a12bdb 100644 --- a/package/twm/Makefile +++ b/package/twm/Makefile @@ -7,13 +7,12 @@ PKG_NAME:= twm PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 109979bd39d48bd761e7939b30006a48 -PKG_DESCR:= X.Org twm application +PKG_DESCR:= simple window manager PKG_SECTION:= x11/apps -PKG_DEPENDS:= xorg-server +PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_ARCH_DEPENDS:= !m68k diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index 5878f7a70..78b005a9d 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -7,11 +7,10 @@ PKG_NAME:= uClibc++ PKG_VERSION:= 0.2.4 PKG_RELEASE:= 2 PKG_MD5SUM:= 394c119363dd8b469fb898442a6764b8 -PKG_DESCR:= A standard c++ library for embedded systems +PKG_DESCR:= standard c++ library for embedded systems PKG_SECTION:= libs PKG_URL:= http://cxx.uclibc.org/ PKG_SITES:= http://cxx.uclibc.org/src/ -PKG_NEED_CXX:= 1 PKG_NOPARALLEL:= 1 PKG_LIBNAME:= uclibc++ PKG_OPTS:= dev diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index 7b7a08357..566ad3aa4 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= utils PKG_DEPENDS:= libtirpc PKG_BUILDDEP:= libtirpc PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/} +PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 5b75880d8..13f289458 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -30,7 +30,6 @@ PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host PKG_URL:= http://xbmc.org/ #PKG_SITES:= http://mirrors.xbmc.org/releases/source/ PKG_SITES:= http://openadk.org/distfiles/ -PKG_NEED_CXX:= 1 PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile index 53fda7019..2edc4d90c 100644 --- a/package/xf86-input-evtouch/Makefile +++ b/package/xf86-input-evtouch/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-input-evtouch PKG_VERSION:= 0.8.8 PKG_RELEASE:= 1 PKG_MD5SUM:= 4d8e092356d8353002f60a4907046c13 -PKG_DESCR:= X11 driver for touchscreen +PKG_DESCR:= x11 driver for touchscreens PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server PKG_BUILDDEP:= xorg-server PKG_SITES:= http://www.conan.de/touchscreen/ -PKG_NEED_CXX:= 1 PKG_CFLINE_XF86_INPUT_EVTOUCH:= depends on ADK_BROKEN diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index 3c2bfc5bc..30307e501 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-input-keyboard PKG_VERSION:= 1.8.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 4f3e135e04939916f37f91a111c6f70b -PKG_DESCR:= X11 driver for keyboard +PKG_DESCR:= x11 driver for keyboard PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server +PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index d93994f92..19673b5fd 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-input-mouse PKG_VERSION:= 1.9.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 125402066940ef30737721243bb1b77e -PKG_DESCR:= X11 driver for mouse +PKG_DESCR:= x11 driver for mouse PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server +PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile index ca025734c..ee08e453b 100644 --- a/package/xf86-video-ati/Makefile +++ b/package/xf86-video-ati/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-video-ati PKG_VERSION:= 6.14.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 6bb71cff9ad9c5c7b258b2b6c56fdc95 -PKG_DESCR:= X11 driver for ATI VGA chip +PKG_DESCR:= x11 driver for ATI VGA chip PKG_SECTION:= x11/drivers +PKG_DEPENDS:= xorg-server libdrm mesalib libudev libstdcxx PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib eudev -PKG_DEPENDS:= xorg-server libdrm mesalib libudev PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= !arm !m68k PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile index e5dc90548..61335d80a 100644 --- a/package/xf86-video-cirrus/Makefile +++ b/package/xf86-video-cirrus/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-video-cirrus PKG_VERSION:= 1.4.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 439e3f5e29161f503bcfe23229dc7b17 -PKG_DESCR:= X11 driver for Cirrus VGA chips +PKG_DESCR:= x11 driver for Cirrus VGA chips PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server +PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server autotool util-macros PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 PKG_SYSTEM_DEPENDS:= qemu-x86 qemu-x86_64 diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile index 41100c442..358c5c774 100644 --- a/package/xf86-video-fbdev/Makefile +++ b/package/xf86-video-fbdev/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-video-fbdev PKG_VERSION:= 0.4.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 2b5e6dd218243cf96c1a4090596a6bba -PKG_DESCR:= X11 driver for Linux Framebuffer devices +PKG_DESCR:= x11 driver for Linux Framebuffer devices PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server +PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index 2430cf7c4..56b83f4c8 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-video-geode PKG_VERSION:= 2.11.15 PKG_RELEASE:= 1 PKG_MD5SUM:= a38a23055fcabed87dbd5e7c9e32bc05 -PKG_DESCR:= X11 driver for AMD Geode VGA chip +PKG_DESCR:= x11 driver for AMD Geode VGA chip PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server +PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 PKG_SYSTEM_DEPENDS:= pcengines-alix1c DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index 6f83d3750..d499d6630 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-video-intel PKG_VERSION:= 2.99.911 PKG_RELEASE:= 1 PKG_MD5SUM:= de51db2408a222ef1c52725f5aa2f185 -PKG_DESCR:= X11 driver for Intel VGA chips +PKG_DESCR:= x11 driver for Intel VGA chips PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server libdrm mesalib +PKG_DEPENDS:= xorg-server libdrm mesalib libstdcxx PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 PKG_SYSTEM_DEPENDS:= ibm-x40 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile index c66486060..44097e853 100644 --- a/package/xf86-video-siliconmotion/Makefile +++ b/package/xf86-video-siliconmotion/Makefile @@ -7,12 +7,11 @@ PKG_NAME:= xf86-video-siliconmotion PKG_VERSION:= 1.7.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 94c44123d8d0a46a7f6bace8508763d8 -PKG_DESCR:= X11 driver for Silicon Motion VGA chips +PKG_DESCR:= x11 driver for Silicon Motion VGA chips PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server +PKG_DEPENDS:= xorg-server libstdcxx PKG_BUILDDEP:= xorg-server PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 PKG_SYSTEM_DEPENDS:= lemote-yeelong DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xinit/Makefile b/package/xinit/Makefile index bd7e75303..8106806c0 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -7,13 +7,12 @@ PKG_NAME:= xinit PKG_VERSION:= 1.2.1 PKG_RELEASE:= 5 PKG_MD5SUM:= 7ad82221ebd6600a8d33712ec3b62efb -PKG_DESCR:= X Window System initializer +PKG_DESCR:= x window system initializer PKG_SECTION:= x11/apps -PKG_DEPENDS:= xorg-server mcookie xauth xset xterm +PKG_DEPENDS:= xorg-server mcookie xauth xset xterm libstdcxx PKG_BUILDDEP:= xorg-server PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ -PKG_NEED_CXX:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 473b9e93d..6ddb22793 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -7,13 +7,13 @@ PKG_NAME:= xorg-server PKG_VERSION:= 1.15.1 PKG_RELEASE:= 1 PKG_MD5SUM:= d6e5444fc33ad737b551cc49061ae704 -PKG_DESCR:= Xorg server +PKG_DESCR:= xorg server PKG_SECTION:= x11/server PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb librt -PKG_DEPENDS+= libxshmfence libfreetype libfontenc +PKG_DEPENDS+= libxshmfence libfreetype libfontenc libstdcxx PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman @@ -21,7 +21,6 @@ PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto PKG_BUILDDEP+= xineramaproto PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} -PKG_NEED_CXX:= 1 PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz |