upload tizen1.0 source

7 files changed, 41 insertions, 56 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100755
index f884ceb..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-CMakeCache.txt
-*/CMakeFiles/*
-*.cmake
-CMakeFiles*
-*.a
-*.so
-Testing
-cmake.depends
-cmake.check_depends
-cmake.check_cache
-core
-core.*
-gmon.out
-install_manifest.txt
-*~
-.kdev_include_paths
-src.kdev4
-.cproject
-.project
-tet_captured
-tet_lock
-*.pc
-*-test
-*-test_*
-*tester.c
-TC/config
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec9f120..4723b60 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ SET(submodule "image-util")
 
 # for package file
 SET(dependents "dlog mmutil-jpeg mmutil-imgp capi-base-common")
+SET(pc_dependents "capi-base-common")
 
 SET(fw_name "${project_prefix}-${service}-${submodule}")
 
@@ -77,9 +78,8 @@ INSTALL(
         )
 
 SET(PC_NAME ${fw_name})
-SET(PC_REQUIRED ${dependents})
+SET(PC_REQUIRED ${pc_dependents})
 SET(PC_LDFLAGS -l${fw_name})
-SET(PC_CFLAGS -I\${includedir}/${service})
 
 CONFIGURE_FILE(
     ${fw_name}.pc.in
diff --git a/capi-media-image-util.pc.in b/capi-media-image-util.pc.in
index 773d667..5d02f8d 100755
--- a/capi-media-image-util.pc.in
+++ b/capi-media-image-util.pc.in
@@ -11,5 +11,5 @@ Description: @PACKAGE_DESCRIPTION@
 Version: @VERSION@
 Requires: @PC_REQUIRED@ 
 Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir} @PC_CFLAGS@
+Cflags: -I${includedir}
 
diff --git a/debian/changelog b/debian/changelog
index 7e0a5a9..54d74d6 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+capi-media-image-util (0.1.0-9) unstable; urgency=low
+
+  * Fix dependency
+  * Git: slp-source.sec.samsung.net:slp/api/image-util
+  * Tag: capi-media-image-util_0.1.0-9
+
+ -- Seungkeun Lee <sngn.lee@samsung.com>  Wed, 14 Mar 2012 13:30:17 +0900
+
 capi-media-image-util (0.1.0-8) unstable; urgency=low
 
   * add so version
diff --git a/debian/control b/debian/control
index baf4eb1..5dd9e43 100755
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,12 @@ Build-Depends: debhelper (>= 5), libmm-utility-dev , capi-base-common-dev , dlog
 
 Package: capi-media-image-util
 Architecture: any
-Depends: ${shilbs:Depends}, ${misc:Depends} , libmm-utility
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A Image Utility library in Tizen Native API
 
 Package: capi-media-image-util-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, capi-media-image-util (= ${Source-Version}), dlog-dev, capi-base-common-dev, libmm-utility-dev 
+Depends: ${shlibs:Depends}, ${misc:Depends}, capi-media-image-util (= ${Source-Version}), capi-base-common-dev
 Description: A Image Utility library in Tizen Native API (DEV)
 
 Package: capi-media-image-util-dbg
diff --git a/include/image_util.h b/include/image_util.h
index 8f10f07..be91ff4 100755
--- a/include/image_util.h
+++ b/include/image_util.h
@@ -217,7 +217,7 @@ int image_util_transform( unsigned char * dest , int *dest_width , int *dest_hei
  * @see	image_util_decode_jpeg_from_memory()
  * @see	image_util_foreach_supported_jpeg_colorspace() 
  */
-int image_util_decode_jpeg( const char *path , image_util_colorspace_e colorspace, unsigned char ** image_buffer , int *width , int *height ,unsigned int *size);
+int image_util_decode_jpeg( const char *path , image_util_colorspace_e colorspace, unsigned char ** image_buffer , int *width , int *height , unsigned int *size);
 
 /**
  * @brief Decodes jpeg image(on memory) to the buffer
diff --git a/packaging/capi-media-image-util.spec b/packaging/capi-media-image-util.spec
index cb83a1d..9cfb38b 100755
--- a/packaging/capi-media-image-util.spec
+++ b/packaging/capi-media-image-util.spec
@@ -1,55 +1,58 @@
 Name:       capi-media-image-util
 Summary:    A Image Utility library in Tizen Native API
 Version:    0.1.0
-Release:    1
+Release:    9
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(capi-base-common)
-BuildRequires:  pkgconfig(mmutil-jpeg)
-BuildRequires:  pkgconfig(mmutil-imgp)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(mm-common)
-Requires(post): /sbin/ldconfig  
-Requires(postun): /sbin/ldconfig
+BuildRequires:  pkgconfig(mmutil-jpeg)
+BuildRequires:  pkgconfig(mmutil-imgp)
+BuildRequires:  pkgconfig(capi-base-common)
+
+BuildRequires:  cmake
+BuildRequires:  gettext-devel
 
 %description
+A Image Utility library in Tizen Native API
 
 
-%package devel
-Summary:  A Image Utility library in Tizen Native API (Development)
-Group:    TO_BE/FILLED_IN
-Requires: %{name} = %{version}-%{release}
+%package devel 
+Summary:    A Image Utility library in Tizen Native API (Developement)
+Group:      TO_BE_FILLED 
+Requires:   %{name} = %{version}-%{release}
+Requires:  pkgconfig(dlog)
+Requires:  pkgconfig(mm-common)
+Requires:  pkgconfig(mmutil-jpeg)
+Requires:  pkgconfig(mmutil-imgp)
+Requires:  pkgconfig(capi-base-common)
 
 %description devel
-
-
+A Image Utility library in Tizen Native API (Developement)
 
 %prep
 %setup -q
 
-
 %build
-FULLVER=%{version}
-MAJORVER=`echo ${FULLVER} | cut -d '.' -f 1`
-cmake . -DFULLVER=${FULLVER} -DMAJORVER=${MAJORVER}
-
-
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-%post -p /sbin/ldconfig
+%post
 
-%postun -p /sbin/ldconfig
+%postun
 
 
 %files
-%{_libdir}/libcapi-media-image-util.so*
+%{_libdir}/lib*.so.*
 
-%files devel
-%{_includedir}/media/*.h
+%files devel 
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
+%{_includedir}/media/*.h
+