From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 11 15:50:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CB721065674 for ; Wed, 11 May 2011 15:50:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EA7418FC0A for ; Wed, 11 May 2011 15:50:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4BFo8kC045131 for ; Wed, 11 May 2011 15:50:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4BFo8db045130; Wed, 11 May 2011 15:50:08 GMT (envelope-from gnats) Resent-Date: Wed, 11 May 2011 15:50:08 GMT Resent-Message-Id: <201105111550.p4BFo8db045130@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Guido Falsi Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C7831065680 for ; Wed, 11 May 2011 15:40:40 +0000 (UTC) (envelope-from mad@madpilot.net) Received: from megatron.madpilot.net (megatron.madpilot.net [88.149.173.206]) by mx1.freebsd.org (Postfix) with ESMTP id 22FA78FC15 for ; Wed, 11 May 2011 15:40:38 +0000 (UTC) Received: from megatron.madpilot.net (localhost [127.0.0.1]) by megatron.madpilot.net (Postfix) with ESMTP id 15DBF16E8 for ; Wed, 11 May 2011 17:40:38 +0200 (CEST) Received: from megatron.madpilot.net ([127.0.0.1]) by megatron.madpilot.net (megatron.madpilot.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id c9ToqNTz1k2e for ; Wed, 11 May 2011 17:40:30 +0200 (CEST) Received: by megatron.madpilot.net (Postfix, from userid 1000) id 7808316E0; Wed, 11 May 2011 17:40:30 +0200 (CEST) Message-Id: <20110511154030.7808316E0@megatron.madpilot.net> Date: Wed, 11 May 2011 17:40:30 +0200 (CEST) From: Guido Falsi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/156963: [maintainer-update] graphics/amide: update to 0.9.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Guido Falsi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2011 15:50:09 -0000 >Number: 156963 >Category: ports >Synopsis: [maintainer-update] graphics/amide: update to 0.9.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 11 15:50:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Guido Falsi >Release: FreeBSD 8.2-STABLE amd64 >Organization: None >Environment: System: FreeBSD megatron.madpilot.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Thu Apr 21 12:44:44 CEST 2011 root@megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON amd64 >Description: Update to 0.9.3. Removed files: files/patch-src-dcmtk_interface.cc files/patch-src-mpeg_encode.c files/patch-src-ui_common.c >How-To-Repeat: >Fix: diff -ruN amide.old/Makefile amide/Makefile --- amide.old/Makefile 2011-05-11 15:57:32.313199702 +0200 +++ amide/Makefile 2011-05-11 15:57:48.200102105 +0200 @@ -6,8 +6,7 @@ # PORTNAME= amide -PORTVERSION= 0.9.2 -PORTREVISION= 1 +PORTVERSION= 0.9.3 CATEGORIES= graphics MASTER_SITES= SF EXTRACT_SUFX= .tgz diff -ruN amide.old/distinfo amide/distinfo --- amide.old/distinfo 2011-05-11 15:57:32.317208490 +0200 +++ amide/distinfo 2011-05-11 15:57:48.200102105 +0200 @@ -1,2 +1,2 @@ -SHA256 (amide-0.9.2.tgz) = bbe230b7aef3c65ef2014d561a09d97b96e50ec4f1a09c16b4de751974ff01be -SIZE (amide-0.9.2.tgz) = 1476952 +SHA256 (amide-0.9.3.tgz) = f664ff89363e96452a94775f645f6ca2bcee628b19f1d72258545bb715da6602 +SIZE (amide-0.9.3.tgz) = 1635189 diff -ruN amide.old/files/patch-configure amide/files/patch-configure --- amide.old/files/patch-configure 2011-05-11 15:57:32.311200057 +0200 +++ amide/files/patch-configure 2011-05-11 15:57:48.199072391 +0200 @@ -1,6 +1,6 @@ ---- configure.orig 2009-12-09 07:35:12.000000000 +0100 -+++ configure 2011-02-10 18:25:18.165872253 +0100 -@@ -17889,13 +17889,13 @@ +--- configure.orig 2011-01-20 03:24:42.000000000 +0100 ++++ configure 2011-05-10 15:10:45.000000000 +0200 +@@ -15399,13 +15399,13 @@ DATADIRNAME=share else CATOBJEXT=.mo @@ -16,8 +16,8 @@ ;; esac fi -@@ -18684,12 +18684,12 @@ - if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then +@@ -16063,12 +16063,12 @@ + if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : DATADIRNAME=share else - DATADIRNAME=lib @@ -31,23 +31,3 @@ ;; esac fi -@@ -19625,7 +19625,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldcmdata -lofstd -lz -L/usr/local/dicom/lib -L/sw/lib $THREAD_LIBS $LIBS" -+LIBS="-ldcmdata -lofstd -loflog -lz -L/usr/local/lib $THREAD_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -20391,8 +20391,8 @@ - - if (test $enable_libdcmdata = yes) && (test $FOUND_DCMDATA = yes); then - echo "Compiling with DCMTK support for DICOM files" -- AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -ldcmdata -lofstd -lz $THREAD_LIBS" -- AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include/dcmtk/dcmdata -I/usr/local/dicom/include/dcmtk/ofstd -I/usr/local/dicom/include -I/usr/include/dcmtk/dcmdata -I/usr/local/include/dcmtk/ofstd -I/sw/include/dcmtk/dcmdata -I/sw/include/dcmtk/ofstd -I/sw/include/dcmtk" -+ AMIDE_LIBDCMDATA_LIBS="-L/usr/local/lib -ldcmdata -lofstd -loflog -lz $THREAD_LIBS" -+ AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/include" - - - diff -ruN amide.old/files/patch-src-dcmtk_interface.cc amide/files/patch-src-dcmtk_interface.cc --- amide.old/files/patch-src-dcmtk_interface.cc 2011-05-11 15:57:32.280203603 +0200 +++ amide/files/patch-src-dcmtk_interface.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,115 +0,0 @@ ---- src/dcmtk_interface.cc.orig 2009-12-14 05:53:11.000000000 +0100 -+++ src/dcmtk_interface.cc 2011-02-11 10:59:18.612565854 +0100 -@@ -32,7 +32,7 @@ - #include - #endif - #include "dcmtk_interface.h" --#include "dcddirif.h" /* for class DicomDirInterface */ -+#include "dcmtk/dcmdata/dcddirif.h" /* for class DicomDirInterface */ - #include - #include - #include "amitk_data_set_DOUBLE_0D_SCALING.h" -@@ -44,7 +44,8 @@ - #undef PACKAGE_STRING - #undef PACKAGE_TARNAME - #undef PACKAGE_VERSION --#include -+#include "amide_config.h" -+#include - //#include - const gchar * dcmtk_version = OFFIS_DCMTK_VERSION; - -@@ -188,7 +189,7 @@ - } - dim.y = return_uint16; - -- if (dcm_dataset->findAndGetUint16(DCM_Planes, return_uint16).bad()) -+ if (dcm_dataset->findAndGetUint16(DCM_RETIRED_Planes, return_uint16).bad()) - dim.z = 1; - else - dim.z = return_uint16; -@@ -352,7 +353,7 @@ - if (dcm_dataset->findAndGetString(DCM_PatientID, return_str, OFTrue).good()) - amitk_data_set_set_subject_id(ds, return_str); - -- if (dcm_dataset->findAndGetFloat64(DCM_PatientsWeight, return_float64).good()) { -+ if (dcm_dataset->findAndGetFloat64(DCM_PatientWeight, return_float64).good()) { - amitk_data_set_set_subject_weight(ds, return_float64); - amitk_data_set_set_displayed_weight_unit(ds, AMITK_WEIGHT_UNIT_KILOGRAM); - } -@@ -429,7 +430,7 @@ - } - } - -- if (dcm_dataset->findAndGetString(DCM_PatientsName, return_str, OFTrue).good()) { -+ if (dcm_dataset->findAndGetString(DCM_PatientName, return_str, OFTrue).good()) { - if (AMITK_OBJECT_NAME(ds) == NULL) - amitk_object_set_name(AMITK_OBJECT(ds), return_str); - amitk_data_set_set_subject_name(ds, return_str); -@@ -495,7 +496,7 @@ - } - } - -- if (dcm_dataset->findAndGetString(DCM_PatientsBirthDate, return_str, OFTrue).good()) -+ if (dcm_dataset->findAndGetString(DCM_PatientBirthDate, return_str, OFTrue).good()) - amitk_data_set_set_subject_dob(ds, return_str); - - /* because of how the dicom coordinates are setup, after reading in the patient slices, -@@ -1257,7 +1258,7 @@ - if (return_str != NULL) - info->patient_id = g_strdup(return_str); - -- dcm_dataset->findAndGetString(DCM_PatientsName, return_str, OFTrue); -+ dcm_dataset->findAndGetString(DCM_PatientName, return_str, OFTrue); - if (return_str != NULL) - info->patient_name = g_strdup(return_str); - -@@ -1537,7 +1538,7 @@ - - /* go through the whole directory */ - while ((patient_record = dcm_root_record->nextSub(patient_record)) != NULL) { -- patient_record->findAndGetString(DCM_PatientsName, record_name[0]); -+ patient_record->findAndGetString(DCM_PatientName, record_name[0]); - patient_record->findAndGetString(DCM_PatientID, patient_id, OFTrue); - - -@@ -1802,8 +1803,9 @@ - } - - #ifdef AMIDE_DEBUG -- dcm_dir.enableVerboseMode(TRUE); -- dcm_dir.setLogStream(&ofConsole); -+// These are not defined in the latest dcmtk and could not find substitutes. -+// dcm_dir.enableVerboseMode(TRUE); -+// dcm_dir.setLogStream(&ofConsole); - #endif - - /* create the DICOMDIR, unless already made in which case we'll append to it */ -@@ -1905,15 +1907,15 @@ - - /* other stuff */ - if (AMITK_DATA_SET_SUBJECT_NAME(ds) != NULL) -- insert_str(dcm_ds,DCM_PatientsName, AMITK_DATA_SET_SUBJECT_NAME(ds)); -+ insert_str(dcm_ds,DCM_PatientName, AMITK_DATA_SET_SUBJECT_NAME(ds)); - if (AMITK_DATA_SET_SUBJECT_ID(ds) != NULL) - insert_str(dcm_ds,DCM_PatientID, AMITK_DATA_SET_SUBJECT_ID(ds)); - if (AMITK_DATA_SET_SUBJECT_DOB(ds) != NULL) -- insert_str(dcm_ds,DCM_PatientsBirthDate, AMITK_DATA_SET_SUBJECT_DOB(ds)); -+ insert_str(dcm_ds,DCM_PatientBirthDate, AMITK_DATA_SET_SUBJECT_DOB(ds)); - if (AMITK_OBJECT_NAME(ds) != NULL) - insert_str(dcm_ds,DCM_StudyDescription, AMITK_OBJECT_NAME(ds)); - insert_double(dcm_ds,DCM_RadionuclideTotalDose, AMITK_DATA_SET_INJECTED_DOSE(ds)); -- insert_double(dcm_ds,DCM_PatientsWeight, AMITK_DATA_SET_SUBJECT_WEIGHT(ds)); -+ insert_double(dcm_ds,DCM_PatientWeight, AMITK_DATA_SET_SUBJECT_WEIGHT(ds)); - - switch(AMITK_DATA_SET_SUBJECT_ORIENTATION(ds)) { - case AMITK_SUBJECT_ORIENTATION_SUPINE_HEADFIRST: -@@ -1949,7 +1951,7 @@ - case AMITK_MODALITY_PET: - insert_str(dcm_ds,DCM_Modality, "PT"); - dcm_metainfo->putAndInsertString(DCM_MediaStorageSOPClassUID, -- UID_PETImageStorage); -+ UID_EnhancedPETImageStorage); - break; - case AMITK_MODALITY_SPECT: - insert_str(dcm_ds,DCM_Modality, "ST"); diff -ruN amide.old/files/patch-src-mpeg_encode.c amide/files/patch-src-mpeg_encode.c --- amide.old/files/patch-src-mpeg_encode.c 2011-05-11 15:57:32.295200382 +0200 +++ amide/files/patch-src-mpeg_encode.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/mpeg_encode.c.orig 2009-11-16 07:55:52.000000000 +0100 -+++ src/mpeg_encode.c 2011-02-08 16:18:47.640994869 +0100 -@@ -141,7 +141,7 @@ - /* -------------------------------------------------------- */ - #ifdef AMIDE_FFMPEG_SUPPORT - --#include -+#include - - - typedef struct { diff -ruN amide.old/files/patch-src-ui_common.c amide/files/patch-src-ui_common.c --- amide.old/files/patch-src-ui_common.c 2011-05-11 15:57:32.298200129 +0200 +++ amide/files/patch-src-ui_common.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/ui_common.c.orig 2009-11-16 06:00:11.000000000 +0100 -+++ src/ui_common.c 2011-02-08 16:21:18.283127798 +0100 -@@ -46,7 +46,7 @@ - #include - #endif - #ifdef AMIDE_FFMPEG_SUPPORT --#include -+#include - #endif - #ifdef AMIDE_LIBFAME_SUPPORT - #include >Release-Note: >Audit-Trail: >Unformatted: