| 1 |
xmw 12/11/04 16:28:21 |
| 2 |
|
| 3 |
Added: oyranos-0.9.0-array.patch |
| 4 |
oyranos-0.9.0-buildsystem.patch |
| 5 |
oyranos-0.9.0-png.patch |
| 6 |
Log: |
| 7 |
Version bump with upstream fixes (thanks Andreas Sturmlechner, bug 440838) |
| 8 |
|
| 9 |
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 media-libs/oyranos/files/oyranos-0.9.0-array.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.9.0-array.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.9.0-array.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: oyranos-0.9.0-array.patch |
| 18 |
=================================================================== |
| 19 |
from http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff;h=0ed3aef1320ccc168c2753ac4cf426290fac6639 |
| 20 |
--- a/API_generated/oyArray2d_s_.c |
| 21 |
+++ b/API_generated/oyArray2d_s_.c |
| 22 |
@@ -13,7 +13,7 @@ |
| 23 |
* @author Kai-Uwe Behrmann <ku.b@×××.de> |
| 24 |
* @par License: |
| 25 |
* new BSD - see: http://www.opensource.org/licenses/bsd-license.php |
| 26 |
- * @date 2012/10/24 |
| 27 |
+ * @date 2012/11/02 |
| 28 |
*/ |
| 29 |
|
| 30 |
|
| 31 |
@@ -404,9 +404,9 @@ |
| 32 |
* |
| 33 |
* @param[in,out] obj struct object |
| 34 |
* |
| 35 |
- * @version Oyranos: 0.1.11 |
| 36 |
+ * @version Oyranos: 0.9.1 |
| 37 |
+ * @date 2012/11/02 |
| 38 |
* @since 2010/09/07 (Oyranos: 0.1.11) |
| 39 |
- * @date 2010/09/07 |
| 40 |
*/ |
| 41 |
int oyArray2d_ReleaseArray_ ( oyArray2d_s * obj ) |
| 42 |
{ |
| 43 |
@@ -428,10 +428,10 @@ |
| 44 |
{ |
| 45 |
if((s->own_lines == 1 && y == s->data_area.y) || |
| 46 |
s->own_lines == 2) |
| 47 |
- deallocateFunc( &s->array2d[y][dsize * (int)s->data_area.x] ); |
| 48 |
+ deallocateFunc( &s->array2d[y][dsize * (int)OY_ROUND(s->data_area.x)] ); |
| 49 |
s->array2d[y] = 0; |
| 50 |
} |
| 51 |
- deallocateFunc( s->array2d + (size_t)s->data_area.y ); |
| 52 |
+ deallocateFunc( s->array2d + (int)OY_ROUND(s->data_area.y) ); |
| 53 |
s->array2d = 0; |
| 54 |
} |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.1 media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch |
| 60 |
|
| 61 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch?rev=1.1&view=markup |
| 62 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch?rev=1.1&content-type=text/plain |
| 63 |
|
| 64 |
Index: oyranos-0.9.0-buildsystem.patch |
| 65 |
=================================================================== |
| 66 |
--- oyranos-0.4.0/configure_tests.sh |
| 67 |
+++ oyranos-0.4.0/configure_tests.sh |
| 68 |
@@ -3,7 +3,7 @@ |
| 69 |
set > testset.txt |
| 70 |
ERROR=0 |
| 71 |
WARNING=0 |
| 72 |
-STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' |
| 73 |
+STRIPOPT='s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' |
| 74 |
|
| 75 |
mkdir -p tests |
| 76 |
|
| 77 |
--- oyranos-0.9.0/oforms/oyranos_xforms.makefile |
| 78 |
+++ oyranos-0.9.0/oforms/oyranos_xforms.makefile |
| 79 |
@@ -1,8 +1,8 @@ |
| 80 |
-INCL = $(INCLUDE) -I../ -I./ $(DEBUG) |
| 81 |
-CC = gcc |
| 82 |
-DEBUG = -Wall -g -O0 |
| 83 |
+INCL = $(INCLUDE) -I../ -I./ |
| 84 |
+CC ?= gcc |
| 85 |
+CXX ?= c++ |
| 86 |
LDFLAGS_ = $$LDFLAGS -L../fl_i18n |
| 87 |
-OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags) |
| 88 |
+OY_LIBS := $(shell pkg-config libxml-2.0 --libs --cflags) ../liboyranos.so ../liboyranos_object.so ../liboyranos_core.so ../liboyranos_config.so ../liboyranos_modules.so |
| 89 |
OY_FLAGS = -L../ $(OY_LIBS) |
| 90 |
FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags | sed s/-O2//) -lpthread |
| 91 |
|
| 92 |
@@ -15,15 +15,15 @@ |
| 93 |
|
| 94 |
oyranos-xforms: $(SRCDIR)oyranos_xforms.c |
| 95 |
echo "Compiling $(SRCDIR)$< + Linking $@ ..." |
| 96 |
- gcc -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_) |
| 97 |
+ $(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_) |
| 98 |
|
| 99 |
oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c |
| 100 |
echo "Compiling $(SRCDIR)$< + Linking $@ ..." |
| 101 |
- gcc -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_) |
| 102 |
+ $(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_) |
| 103 |
|
| 104 |
oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h |
| 105 |
echo "Compiling $(SRCDIR)$< + Linking $@ ..." |
| 106 |
- -c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS) |
| 107 |
+ $(CXX) $(LDFLAGS_) -Wall $(CXXFLAGS) $(LDFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS) |
| 108 |
|
| 109 |
|
| 110 |
# Build commands and filename extensions... |
| 111 |
--- oyranos-0.9.0/oyranos-config.in |
| 112 |
+++ oyranos-0.9.0/oyranos-config.in |
| 113 |
@@ -109,7 +109,7 @@ |
| 114 |
|
| 115 |
if [ "$echo_ldflags" = "yes" ]; then |
| 116 |
if [ -f liboyranos.so ]; then |
| 117 |
- echo "-L. -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add" |
| 118 |
+ echo "lliboyranos.so liboyranos_config.so liboyranos_modules.so liboyranos_object.so liboyranos_core.so $elektra $oyranos_add" |
| 119 |
else |
| 120 |
echo "-L$libdir -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add" |
| 121 |
fi |
| 122 |
--- oyranos-0.9.0/configure |
| 123 |
+++ oyranos-0.9.0/configure |
| 124 |
@@ -121,8 +121,6 @@ |
| 125 |
fi |
| 126 |
IFS=$old_IFS |
| 127 |
|
| 128 |
-STRIPOPT="sed s/-O.//" |
| 129 |
- |
| 130 |
if [ $# -gt 0 ]; then |
| 131 |
prefix="" |
| 132 |
while [ $# -gt 0 ]; do |
| 133 |
@@ -680,17 +678,8 @@ |
| 134 |
test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_NV |
| 135 |
export CC CXX |
| 136 |
|
| 137 |
-# many constant strings are much longer than the C90 allowed, skip the warning |
| 138 |
-CFLAGS_COMMON="`echo $CFLAGS_COMMON | $STRIPOPT` \$(DEBUG) \$(OPENMP)" |
| 139 |
-CXXFLAGS_COMMON="`echo $CXXFLAGS_COMMON | $STRIPOPT` \$(DEBUG) \$(OPENMP)" |
| 140 |
-CFLAGS="`echo $CFLAGS | $STRIPOPT`" |
| 141 |
-CXXFLAGS="`echo $CXXFLAGS | $STRIPOPT`" |
| 142 |
|
| 143 |
-if [ -z "$LDFLAGS" ]; then |
| 144 |
- LDFLAGS="-L./ -L$libdir" |
| 145 |
-else |
| 146 |
- LDFLAGS="`echo $LDFLAGS | $STRIPOPT` -L./ -L$libdir" |
| 147 |
-fi |
| 148 |
+#LDFLAGS="-L./ -L$libdir" |
| 149 |
|
| 150 |
|
| 151 |
# detect Libraries |
| 152 |
@@ -760,12 +749,12 @@ |
| 153 |
--copyright-holder='Kai-Uwe Behrmann' \ |
| 154 |
--msgid-bugs-address='ku.b@×××.de' \ |
| 155 |
--from-code=utf-8" >> $CONF |
| 156 |
- oyranos_add="-L\$libdir \$ltdl \$xml2 \$iconv \$intl \$yajl" |
| 157 |
+ oyranos_add="\$ltdl \$xml2 \$iconv \$intl \$yajl" |
| 158 |
if [ $OSUNAME = "Linux" ]; then |
| 159 |
COPY="cp -vdpa" |
| 160 |
MOVE="mv -v" |
| 161 |
RM="rm -vf" |
| 162 |
- LDFLAGS="$LDFLAGS -L." |
| 163 |
+ LDFLAGS="$LDFLAGS" |
| 164 |
test -n "$ECHO" && $ECHO "LINK_FLAGS_STATIC =" >> $CONF |
| 165 |
if [ -n "$rpath" ]; then |
| 166 |
test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl," >> $CONF |
| 167 |
@@ -1294,9 +1283,9 @@ |
| 168 |
test -n "$ECHO" && $ECHO "" >> $VERS_H |
| 169 |
test -n "$ECHO" && $ECHO "#endif /*OYRANOS_VERSION_H*/" >> $VERS_H |
| 170 |
|
| 171 |
-CFLAGS="$CFLAGS_COMMON `echo $CFLAGS | $STRIPOPT`" |
| 172 |
-CXXFLAGS="$CXXFLAGS_COMMON `echo $CXXFLAGS | $STRIPOPT`" |
| 173 |
-LDFLAGS="`echo $LDFLAGS | $STRIPOPT` \$(dl) \$(DEVEL_LIBS)" |
| 174 |
+CFLAGS="$CFLAGS_COMMON $CFLAGS" |
| 175 |
+CXXFLAGS="$CXXFLAGS_COMMON $CXXFLAGS" |
| 176 |
+LDFLAGS="$LDFLAGS \$(dl) \$(DEVEL_LIBS)" |
| 177 |
|
| 178 |
test -n "$ECHO" && $ECHO "CFLAGS=$CFLAGS" >> $CONF_NV |
| 179 |
test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS" >> $CONF_I18N |
| 180 |
|
| 181 |
|
| 182 |
|
| 183 |
1.1 media-libs/oyranos/files/oyranos-0.9.0-png.patch |
| 184 |
|
| 185 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.9.0-png.patch?rev=1.1&view=markup |
| 186 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/files/oyranos-0.9.0-png.patch?rev=1.1&content-type=text/plain |
| 187 |
|
| 188 |
Index: oyranos-0.9.0-png.patch |
| 189 |
=================================================================== |
| 190 |
from http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff;h=c39976bf5de8a70f71cef2ecafae13d17e811857 |
| 191 |
--- a/modules/oyranos_cmm_oPNG.c |
| 192 |
+++ b/modules/oyranos_cmm_oPNG.c |
| 193 |
@@ -816,7 +816,8 @@ oyImage_s * oyImage_FromPNG ( const char * filename, |
| 194 |
spp = 2; break; |
| 195 |
case PNG_COLOR_TYPE_PALETTE: |
| 196 |
png_set_palette_to_rgb( png_ptr ); |
| 197 |
- spp = 3; break; |
| 198 |
+ /* expect alpha */ |
| 199 |
+ spp = 4; break; |
| 200 |
case PNG_COLOR_TYPE_RGB: |
| 201 |
spp = 3; break; |
| 202 |
case PNG_COLOR_TYPE_RGB_ALPHA: |
| 203 |
@@ -884,10 +885,15 @@ oyImage_s * oyImage_FromPNG ( const char * filename, |
| 204 |
oyToDataType_m(pixel_layout), |
| 205 |
0 ); |
| 206 |
png_byte ** array2d = (png_byte**) oyArray2d_GetData( a ); |
| 207 |
- int i; |
| 208 |
+ int i,y; |
| 209 |
|
| 210 |
+ /* both variants of libpng access appear equal */ |
| 211 |
+ if(1) |
| 212 |
+ png_read_image( png_ptr, array2d ); |
| 213 |
+ else |
| 214 |
for( i = 0; i < num_passes; ++i ) |
| 215 |
- png_read_rows( png_ptr, array2d, NULL, height ); |
| 216 |
+ for( y = 0; y < height; ++y ) |
| 217 |
+ png_read_row( png_ptr, array2d[y], NULL ); |
| 218 |
|
| 219 |
oyImage_SetData ( image_in, (oyStruct_s**) &a, 0,0,0,0,0,0 ); |
| 220 |
} |
Archives