Message ID | 535A0F97.6010806@gmail.com |
---|---|
State | Superseded |
Headers | show |
Dear William Frost, This patch is not your complete patch: it's a difference compared to your previous version. You should merge this commit with your previous one. See how to use "git rebase --interactive" to achieve that. Also, your patch is line-wrapped, due to Thunderbird doing stupid things. As explained in the Buildroot manual, we recommend you to use git send-email to send your patches, this will guarantee they arrive with the proper format. Also, the title of the patch should be: [PATCH v2] dcmtk: new package To achieve that, you have to: * Set the commit title to "dcmtk: new package" when making your commit * Use 'git format-patch --subject-prefix="PATCH v2" HEAD^' when generating your patch. Best regards, Thomas On Fri, 25 Apr 2014 16:32:39 +0900, William Frost wrote: > > Signed-off-by: William Frost <tsmrnd0@gmail.com> > > Changes v1 -> v2: > - fixed DCMTK_LICENSE to BDS > - changed --host=$(arm-none-linux-gnueabi) to --host=$(GNU_TARGET_NAME) > - fixed PKG_CONFIG_PATH and PKG_CONFIG_SYSROOT_DIR > > (suggested by Thomas De Schampheleire): > - fixed all lines to less than 80 characters in Config.in ans dcmtk.mk > - changed BR2_DCMTK_VERSION to BR2_PACKAGE_DCMTK_VERSION > - removed DCMTK_SOURCE > --- > package/dcmtk/Config.in | 24 +++++++++++++--------- > package/dcmtk/dcmtk.mk | 54 > +++++++++++++++++++++++++++++-------------------- > 2 files changed, 47 insertions(+), 31 deletions(-) > > diff --git a/package/dcmtk/Config.in b/package/dcmtk/Config.in > index d5db101..ba9d2ee 100644 > --- a/package/dcmtk/Config.in > +++ b/package/dcmtk/Config.in > @@ -1,7 +1,13 @@ > config BR2_PACKAGE_DCMTK > bool "dcmtk" > help > - DCMTK is a collection of libraries and applications implementing > large parts the DICOM standard. It includes software for examining, > constructing and converting DICOM image files, handling offline media, > sending and receiving images over a network connection, as well as > demonstrative image storage and worklist servers. DCMTK is is written in > a mixture of ANSI C and C++. It comes in complete source code and is > made available as "open source" software. > + DCMTK is a collection of libraries and applications implementing > + large parts the DICOM standard. It includes software for examining, > + constructing and converting DICOM image files, handling offline > + media, sending and receiving images over a network connection, as > + well as demonstrative image storage and worklist servers. DCMTK is > + is written in a mixture of ANSI C and C++. It comes in complete > + source code and is made available as "open source" software. > > http://dicom.offis.de/dcmtk.php.en > > @@ -9,24 +15,24 @@ if BR2_PACKAGE_DCMTK > > choice > prompt "DCMTK Version" > - default BR2_DCMTK_VERSION_3_6_0 > + default BR2_PACKAGE_DCMTK_VERSION_3_6_0 > help > Select the version of DCMTK you wish to use. > > - config BR2_DCMTK_VERSION_3_6_0 > + config BR2_PACKAGE_DCMTK_VERSION_3_6_0 > bool "DCMTK 3.6.0" > > - config BR2_DCMTK_VERSION_SNAPSHOT_2012 > + config BR2_PACKAGE_DCMTK_VERSION_SNAPSHOT_2012 > bool "DCMTK 3.6.1 snapshot (2012.11.02)" > > - config BR2_DCMTK_VERSION_SNAPSHOT_2013 > + config BR2_PACKAGE_DCMTK_VERSION_SNAPSHOT_2013 > bool "DCMTK 3.6.1 snapshot (2013.11.14)" > > endchoice > > -config BR2_DCMTK_VERSION > +config BR2_PACKAGE_DCMTK_VERSION > string > - default "3.6.0" if BR2_DCMTK_VERSION_3_6_0 > - default "3.6.1_20121102" if BR2_DCMTK_VERSION_SNAPSHOT_2012 > - default "3.6.1_20131114" if BR2_DCMTK_VERSION_SNAPSHOT_2013 > + default "3.6.0" if BR2_PACKAGE_DCMTK_VERSION_3_6_0 > + default "3.6.1_20121102" if BR2_PACKAGE_DCMTK_VERSION_SNAPSHOT_2012 > + default "3.6.1_20131114" if BR2_PACKAGE_DCMTK_VERSION_SNAPSHOT_2013 > endif > diff --git a/package/dcmtk/dcmtk.mk b/package/dcmtk/dcmtk.mk > index b3f4a69..5c9a851 100644 > --- a/package/dcmtk/dcmtk.mk > +++ b/package/dcmtk/dcmtk.mk > @@ -1,45 +1,56 @@ > -############################################################# > +################################################################################ > # > # dcmtk > # > -############################################################# > +################################################################################ > +DCMTK_VERSION = $(call qstrip,$(BR2_PACKAGE_DCMTK_VERSION)) > > - > -DCMTK_SOURCE = dcmtk-$(BR2_DCMTK_VERSION).tar.gz > - > -ifeq ($(BR2_DCMTK_VERSION), "3.6.0") > +ifeq ($(BR2_PACKAGE_DCMTK_VERSION), "3.6.0") > DCMTK_SITE = http://dicom.offis.de/download/dcmtk/dcmtk360/ > endif > -ifeq ($(BR2_DCMTK_VERSION),"3.6.1_20121102") > +ifeq ($(BR2_PACKAGE_DCMTK_VERSION),"3.6.1_20121102") > DCMTK_SITE = http://dicom.offis.de/download/dcmtk/snapshot/old > endif > -ifeq ($(BR2_DCMTK_VERSION),"3.6.1_20131114") > +ifeq ($(BR2_PACKAGE_DCMTK_VERSION),"3.6.1_20131114") > DCMTK_SITE = http://dicom.offis.de/download/dcmtk/snapshot > endif > > -DCMTK_VERSION = $(BR2_DCMTK_VERSION) > -DCMTK_LICENSE = GPLv3+ > +DCMTK_LICENSE = BSD > DCMTK_LICENSE_FILES = COPYING > DCMTK_INSTALL_STAGING = YES > > -DCMTK_CFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -O > -D_REENTRANT -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE > -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L -Wall -Wno-psabi > -DCMTK_CXXFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -O > -D_REENTRANT -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE > -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L -Wall -Wno-psabi > +DCMTK_CFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -O -D_REENTRANT \ > + -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE \ > + -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L -Wall \ > + -Wno-psabi > + > +DCMTK_CXXFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -O > -D_REENTRANT \ > + -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE \ > + -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L -Wall \ > + -Wno-psabi > + > DCMTK_CPPFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) > DCMTK_LDFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) > > -DCMTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) > STRIP=$(TARGET_STRIP) install > +DCMTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) \ > + install > + > DCMTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) > install > -DCMTK_CONF_OPT = --without-libtiff --without-openssl --without-libxml > --without-libpng --without-libsndfile --without-private-tags > --disable-debug --enable-std-includes --disable-rpath > + > +DCMTK_CONF_OPT = --without-libtiff --without-openssl --without-libxml \ > + --without-libpng --without-libsndfile --disable-debug \ > + --without-private-tags --enable-std-includes --disable-rpath > > ifeq ($(BR2_PACKAGE_ZLIB),y) > -DCMTK_DEPENDENCIES += zlib > + DCMTK_DEPENDENCIES += zlib > else > -DCMTK_CONF_OPT += --without-zlib > + DCMTK_CONF_OPT += --without-zlib > endif > VERBOSE=1 > > define DCMTK_CONFIG_SET > - $(CAT) $(@D)/config/Makefile.def | $(SED) 's%^$(1).*%$(1) = $(2)%g' > $(@D)/config/Makefile.def > + $(CAT) $(@D)/config/Makefile.def | $(SED) 's%^$(1).*%$(1) = $(2)%g' \ > + $(@D)/config/Makefile.def > endef > > define DCMTK_CONFIGURE_CMDS > @@ -54,16 +65,15 @@ define DCMTK_CONFIGURE_CMDS > RANLIB=$(TARGET_RANLIB) \ > AR=$(TARGET_AR) \ > STRIP=$(TARGET_STRIP) \ > - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ > - > PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ > + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ > + PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ > PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ > MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \ > $(if $(VERBOSE),-verbose,-silent) \ > $(DCMTK_CONF_OPT) \ > - ac_cv_my_c_rightshift_unsigned=no \ > - --prefix=$(STAGING_DIR)/usr \ > + ac_cv_my_c_rightshift_unsigned=no --prefix=$(STAGING_DIR)/usr \ > --with-zlibinc=$(STAGING_DIR)/usr \ > - --host="arm-none-linux-gnueabi" \ > + --host=$(GNU_TARGET_NAME) \ > ) > endef >
diff --git a/package/dcmtk/Config.in b/package/dcmtk/Config.in index d5db101..ba9d2ee 100644 --- a/package/dcmtk/Config.in +++ b/package/dcmtk/Config.in @@ -1,7 +1,13 @@ config BR2_PACKAGE_DCMTK bool "dcmtk" help - DCMTK is a collection of libraries and applications implementing large parts the DICOM standard. It includes software for examining, constructing and converting DICOM image files, handling offline media, sending and receiving images over a network connection, as well as demonstrative image storage and worklist servers. DCMTK is is written in a mixture of ANSI C and C++. It comes in complete source code and is made available as "open source" software. + DCMTK is a collection of libraries and applications implementing + large parts the DICOM standard. It includes software for examining, + constructing and converting DICOM image files, handling offline + media, sending and receiving images over a network connection, as + well as demonstrative image storage and worklist servers. DCMTK is + is written in a mixture of ANSI C and C++. It comes in complete + source code and is made available as "open source" software. http://dicom.offis.de/dcmtk.php.en @@ -9,24 +15,24 @@ if BR2_PACKAGE_DCMTK choice prompt "DCMTK Version" - default BR2_DCMTK_VERSION_3_6_0 + default BR2_PACKAGE_DCMTK_VERSION_3_6_0 help Select the version of DCMTK you wish to use. - config BR2_DCMTK_VERSION_3_6_0 + config BR2_PACKAGE_DCMTK_VERSION_3_6_0 bool "DCMTK 3.6.0" - config BR2_DCMTK_VERSION_SNAPSHOT_2012 + config BR2_PACKAGE_DCMTK_VERSION_SNAPSHOT_2012 bool "DCMTK 3.6.1 snapshot (2012.11.02)" - config BR2_DCMTK_VERSION_SNAPSHOT_2013 + config BR2_PACKAGE_DCMTK_VERSION_SNAPSHOT_2013 bool "DCMTK 3.6.1 snapshot (2013.11.14)" endchoice -config BR2_DCMTK_VERSION +config BR2_PACKAGE_DCMTK_VERSION string - default "3.6.0" if BR2_DCMTK_VERSION_3_6_0 - default "3.6.1_20121102" if BR2_DCMTK_VERSION_SNAPSHOT_2012 - default "3.6.1_20131114" if BR2_DCMTK_VERSION_SNAPSHOT_2013 + default "3.6.0" if BR2_PACKAGE_DCMTK_VERSION_3_6_0 + default "3.6.1_20121102" if BR2_PACKAGE_DCMTK_VERSION_SNAPSHOT_2012 + default "3.6.1_20131114" if BR2_PACKAGE_DCMTK_VERSION_SNAPSHOT_2013 endif diff --git a/package/dcmtk/dcmtk.mk b/package/dcmtk/dcmtk.mk index b3f4a69..5c9a851 100644 --- a/package/dcmtk/dcmtk.mk +++ b/package/dcmtk/dcmtk.mk @@ -1,45 +1,56 @@ -############################################################# +################################################################################ # # dcmtk # -############################################################# +################################################################################ +DCMTK_VERSION = $(call qstrip,$(BR2_PACKAGE_DCMTK_VERSION)) - -DCMTK_SOURCE = dcmtk-$(BR2_DCMTK_VERSION).tar.gz - -ifeq ($(BR2_DCMTK_VERSION), "3.6.0") +ifeq ($(BR2_PACKAGE_DCMTK_VERSION), "3.6.0") DCMTK_SITE = http://dicom.offis.de/download/dcmtk/dcmtk360/ endif -ifeq ($(BR2_DCMTK_VERSION),"3.6.1_20121102") +ifeq ($(BR2_PACKAGE_DCMTK_VERSION),"3.6.1_20121102") DCMTK_SITE = http://dicom.offis.de/download/dcmtk/snapshot/old endif -ifeq ($(BR2_DCMTK_VERSION),"3.6.1_20131114") +ifeq ($(BR2_PACKAGE_DCMTK_VERSION),"3.6.1_20131114") DCMTK_SITE = http://dicom.offis.de/download/dcmtk/snapshot endif -DCMTK_VERSION = $(BR2_DCMTK_VERSION) -DCMTK_LICENSE = GPLv3+ +DCMTK_LICENSE = BSD DCMTK_LICENSE_FILES = COPYING DCMTK_INSTALL_STAGING = YES -DCMTK_CFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -O -D_REENTRANT -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L -Wall -Wno-psabi -DCMTK_CXXFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -O -D_REENTRANT -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L -Wall -Wno-psabi +DCMTK_CFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -O -D_REENTRANT \ + -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE \ + -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L -Wall \ + -Wno-psabi + +DCMTK_CXXFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -O -D_REENTRANT \ + -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE \ + -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L -Wall \ + -Wno-psabi + DCMTK_CPPFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) DCMTK_LDFLAGS = $(TARGET_CFLAGS) --sysroot=$(STAGING_DIR) -DCMTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install +DCMTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) \ + install + DCMTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install -DCMTK_CONF_OPT = --without-libtiff --without-openssl --without-libxml --without-libpng --without-libsndfile --without-private-tags --disable-debug --enable-std-includes --disable-rpath + +DCMTK_CONF_OPT = --without-libtiff --without-openssl --without-libxml \ + --without-libpng --without-libsndfile --disable-debug \ + --without-private-tags --enable-std-includes --disable-rpath ifeq ($(BR2_PACKAGE_ZLIB),y) -DCMTK_DEPENDENCIES += zlib + DCMTK_DEPENDENCIES += zlib else -DCMTK_CONF_OPT += --without-zlib + DCMTK_CONF_OPT += --without-zlib endif VERBOSE=1 define DCMTK_CONFIG_SET - $(CAT) $(@D)/config/Makefile.def | $(SED) 's%^$(1).*%$(1) = $(2)%g' $(@D)/config/Makefile.def + $(CAT) $(@D)/config/Makefile.def | $(SED) 's%^$(1).*%$(1) = $(2)%g' \ + $(@D)/config/Makefile.def
Signed-off-by: William Frost <tsmrnd0@gmail.com> Changes v1 -> v2: - fixed DCMTK_LICENSE to BDS - changed --host=$(arm-none-linux-gnueabi) to --host=$(GNU_TARGET_NAME) - fixed PKG_CONFIG_PATH and PKG_CONFIG_SYSROOT_DIR (suggested by Thomas De Schampheleire): - fixed all lines to less than 80 characters in Config.in ans dcmtk.mk - changed BR2_DCMTK_VERSION to BR2_PACKAGE_DCMTK_VERSION - removed DCMTK_SOURCE --- package/dcmtk/Config.in | 24 +++++++++++++--------- package/dcmtk/dcmtk.mk | 54 +++++++++++++++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 31 deletions(-) endef define DCMTK_CONFIGURE_CMDS @@ -54,16 +65,15 @@ define DCMTK_CONFIGURE_CMDS RANLIB=$(TARGET_RANLIB) \ AR=$(TARGET_AR) \ STRIP=$(TARGET_STRIP) \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ + PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \ $(if $(VERBOSE),-verbose,-silent) \ $(DCMTK_CONF_OPT) \ - ac_cv_my_c_rightshift_unsigned=no \ - --prefix=$(STAGING_DIR)/usr \ + ac_cv_my_c_rightshift_unsigned=no --prefix=$(STAGING_DIR)/usr \ --with-zlibinc=$(STAGING_DIR)/usr \ - --host="arm-none-linux-gnueabi" \ + --host=$(GNU_TARGET_NAME) \ ) endef