← Back to branch summary

~ubuntu-branches/ubuntu/saucy/libjpeg-turbo/saucy-security

« back to all changes in this revision

Viewing changes to debian/patches/branch-updates.diff

  • Committer: Package Import Robot
  • Author(s): Fathi Boudra
  • Date: 2013-07-28 16:52:51 UTC
  • mfrom: (1.1.3) (9.1.1 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130728165251-7vg6wszhm941kdej
Tags: 1.3.0-0ubuntu1
* New upstream release.
  - drop debian/patches/branch-updates.diff
  - refresh tjunittest.patch (now renamed to install-tjunittest.patch)
* Update debian/control:
  - add myself to Uploaders.
* Update debian/copyright:
  - add RSA Data Security copyright (md5).
* Update debian/libturbojpeg.install:
  - install libturbojpeg.so.0* (needed by tjunittest and tjbench).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/branch-updates.diff
1
 
--- a/release/makedpkg.in       (.../tags/1.2.1)        (revision 861)
2
 
+++ b/release/makedpkg.in       (.../branches/1.2.x)    (revision 861)
3
 
@@ -67,6 +67,10 @@
4
 
                mkdir -p $TMPDIR/usr/include
5
 
                mv $TMPDIR/opt/$DIRNAME/include/turbojpeg.h $TMPDIR/usr/include
6
 
                ln -fs /usr/include/turbojpeg.h $TMPDIR/opt/$DIRNAME/include/
7
 
+       else
8
 
+               mkdir -p $TMPDIR/usr/lib/i386-linux-gnu
9
 
+               ln -fs /usr/lib32/libturbojpeg.so $TMPDIR/usr/lib/i386-linux-gnu/libturbojpeg.so
10
 
+               ln -fs /usr/lib32/libturbojpeg.a $TMPDIR/usr/lib/i386-linux-gnu/libturbojpeg.a
11
 
        fi
12
 
 
13
 
        sudo chown -Rh root:root $TMPDIR/*
14
 
--- a/turbojpeg.c       (.../tags/1.2.1)        (revision 861)
15
 
+++ b/turbojpeg.c       (.../branches/1.2.x)    (revision 861)
16
 
@@ -891,6 +891,7 @@
17
 
        }
18
 
 
19
 
        if(flags&TJFLAG_FASTUPSAMPLE) dinfo->do_fancy_upsampling=FALSE;
20
 
+       if(flags&TJFLAG_FASTDCT) dinfo->dct_method=JDCT_FASTEST;
21
 
        dinfo->raw_data_out=TRUE;
22
 
 
23
 
        jpeg_start_decompress(dinfo);
24
 
--- a/simd/CMakeLists.txt       (.../tags/1.2.1)        (revision 861)
25
 
+++ b/simd/CMakeLists.txt       (.../branches/1.2.x)    (revision 861)
26
 
@@ -43,16 +43,19 @@
27
 
   set(DEPFILE "")
28
 
   set(SIMD_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${file}.asm)
29
 
   if(${file} MATCHES col)
30
 
-    set(DEPFILE ${SIMD_SRC})
31
 
+    set(DEPFILE ${file})
32
 
     string(REGEX REPLACE "col" "clr" DEPFILE ${DEPFILE})
33
 
+    set(DEPFILE ${CMAKE_CURRENT_SOURCE_DIR}/${DEPFILE}.asm)
34
 
   endif()
35
 
   if(${file} MATCHES mer)
36
 
-    set(DEPFILE ${SIMD_SRC})
37
 
+    set(DEPFILE ${file})
38
 
     string(REGEX REPLACE "mer" "mrg" DEPFILE ${DEPFILE})
39
 
+    set(DEPFILE ${CMAKE_CURRENT_SOURCE_DIR}/${DEPFILE}.asm)
40
 
   endif()
41
 
   if(${file} MATCHES gra)
42
 
-    set(DEPFILE ${SIMD_SRC})
43
 
+    set(DEPFILE ${file})
44
 
     string(REGEX REPLACE "gra" "gry" DEPFILE ${DEPFILE})
45
 
+    set(DEPFILE ${CMAKE_CURRENT_SOURCE_DIR}/${DEPFILE}.asm)
46
 
   endif()
47
 
   set(SIMD_OBJ ${OBJDIR}/${file}.obj)
48
 
   add_custom_command(OUTPUT ${SIMD_OBJ}
49
 
--- a/ChangeLog.txt     (.../tags/1.2.1)        (revision 861)
50
 
+++ b/ChangeLog.txt     (.../branches/1.2.x)    (revision 861)
51
 
@@ -1,3 +1,14 @@
52
 
+1.2.2 (not yet released)
53
 
+========================
54
 
+
55
 
+[1] The tjDecompressToYUV() function now supports the TJFLAG_FASTDCT flag.
56
 
+
57
 
+[2] The 32-bit supplementary package for amd64 Debian systems now provides
58
 
+symlinks in /usr/lib/i386-linux-gnu for the TurboJPEG libraries in /usr/lib32.
59
 
+This allows those libraries to be used on MultiArch-compatible systems (such as
60
 
+Ubuntu 11 and later) without setting the linker path.
61
 
+
62
 
+
63
 
 1.2.1
64
 
 =====
65