tizen 2.3.1 release

diff --git a/.gitignore b/.gitignore
new file mode 100755 (executable)
index 0000000..6c53821
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+build_log
+*.log
+*.pyc
+usr
+opt
+*.o
+*.os
+*.exe
+packages
+binaries
+*.ipk
+*~

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..be07eef
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,14 @@
+libogg (1.2.1-0slp2) unstable; urgency=low
+
+  * Repackaging
+  * Git : 165.213.180.234:/git/slp/unmodified/libogg
+  * Tag : libogg_1.2.1-0slp2
+
+ -- YoungHwan Ahn <younghwan_.an@samsung.com>  Mon, 29 Nov 2010 15:00:31 +0900
+
+libogg (1.1.4~dfsg-0) unstable; urgency=low
+
+  * Import to slp2.0
+
+ -- KwangHui Cho <kwanghui.cho@samsung.com>  Thu, 07 Jan 2010 16:13:40 +0900
+ 

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..cfddea4
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,33 @@
+Source: libogg
+Section: libs
+Priority: optional
+Maintainer: Seungbae Shin <seungbae.shin@samsung.com>, JongHyuk Choi <jhchoi.choi@samsung.com>
+Uploaders: YoungHwan Ahn <younghwan_.an@samsung.com>
+Build-Depends: debhelper(>=5)
+Standards-Version: 3.8.3.0
+Homepage: http://xiph.org/ogg/
+Vcs-Git: git://git.debian.org/users/ron/libogg.git
+Vcs-Browser: http://git.debian.org/?p=users/ron/libogg.git;a=summary
+
+Package: libogg0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: Ogg bitstream library
+ Libogg is a library for manipulating ogg bitstreams.  It handles
+ both making ogg bitstreams and getting packets from ogg bitstreams.
+
+Package: libogg-dev
+Architecture: any
+Section: libdevel
+Depends: libogg0 (= ${binary:Version})
+Description: Ogg bitstream library development files
+ The libogg-dev package contains the header files and documentation
+ needed to develop applications with libogg.
+
+Package: libogg-dbg
+Architecture: any
+Section: debug
+Depends: ${shlibs:Depends}, ${misc:Depends}, libogg0 (= ${binary:Version})
+Description: Ogg bitstream library development files
+ The libogg0-dbg package contains unstripped binary for debugging

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..5658f4b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,36 @@
+This package was debianized by Christopher L Cheney <ccheney@debian.org> on
+Sun, 29 Oct 2000 01:11:57 -0500.
+
+It was downloaded from http://www.xiph.org/downloads/
+
+Upstream Author: Christopher Montgomery <monty@xiph.org>
+
+Copyright (c) 2002-2004, Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.Org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

diff --git a/debian/libogg-dev.install b/debian/libogg-dev.install
new file mode 100644 (file)
index 0000000..5447f4e
--- /dev/null
+++ b/debian/libogg-dev.install
@@ -0,0 +1,6 @@
+usr/include/*
+usr/lib/libogg.a
+usr/lib/libogg.so
+usr/lib/pkgconfig/ogg.pc
+usr/share/aclocal/ogg.m4
+usr/share/doc/libogg-*/*       usr/share/doc/libogg-dev/html

diff --git a/debian/libogg0.install b/debian/libogg0.install
new file mode 100644 (file)
index 0000000..71b1d8c
--- /dev/null
+++ b/debian/libogg0.install
@@ -0,0 +1 @@
+usr/lib/libogg.so.*

diff --git a/debian/libogg0.symbols b/debian/libogg0.symbols
new file mode 100644 (file)
index 0000000..41f4346
--- /dev/null
+++ b/debian/libogg0.symbols
@@ -0,0 +1,73 @@
+libogg.so.0 libogg0 #MINVER#
+ ogg_packet_clear@Base 1.0rc3
+ ogg_page_bos@Base 1.0rc3
+ ogg_page_checksum_set@Base 1.0rc3
+ ogg_page_continued@Base 1.0rc3
+ ogg_page_eos@Base 1.0rc3
+ ogg_page_granulepos@Base 1.0rc3
+ ogg_page_packets@Base 1.0rc3
+ ogg_page_pageno@Base 1.0rc3
+ ogg_page_serialno@Base 1.0rc3
+ ogg_page_version@Base 1.0rc3
+ ogg_stream_check@Base 1.1.4~dfsg
+ ogg_stream_clear@Base 1.0rc3
+ ogg_stream_destroy@Base 1.0rc3
+ ogg_stream_eos@Base 1.0rc3
+ ogg_stream_flush@Base 1.0rc3
+ ogg_stream_init@Base 1.0rc3
+ ogg_stream_iovecin@Base 1.1.4~dfsg
+ ogg_stream_packetin@Base 1.0rc3
+ ogg_stream_packetout@Base 1.0rc3
+ ogg_stream_packetpeek@Base 1.0rc3
+ ogg_stream_pagein@Base 1.0rc3
+ ogg_stream_pageout@Base 1.0rc3
+ ogg_stream_pageout_fill@Base 1.2.1-0
+ ogg_stream_reset@Base 1.0rc3
+ ogg_stream_reset_serialno@Base 1.1.0
+ ogg_sync_buffer@Base 1.0rc3
+ ogg_sync_check@Base 1.1.4~dfsg
+ ogg_sync_clear@Base 1.0rc3
+ ogg_sync_destroy@Base 1.0rc3
+ ogg_sync_init@Base 1.0rc3
+ ogg_sync_pageout@Base 1.0rc3
+ ogg_sync_pageseek@Base 1.0rc3
+ ogg_sync_reset@Base 1.0rc3
+ ogg_sync_wrote@Base 1.0rc3
+ oggpackB_adv1@Base 1.1.0
+ oggpackB_adv@Base 1.1.0
+ oggpackB_bits@Base 1.1.0
+ oggpackB_bytes@Base 1.1.0
+ oggpackB_get_buffer@Base 1.1.0
+ oggpackB_look1@Base 1.1.0
+ oggpackB_look@Base 1.1.0
+ oggpackB_read1@Base 1.1.0
+ oggpackB_read@Base 1.1.0
+ oggpackB_readinit@Base 1.1.0
+ oggpackB_reset@Base 1.1.0
+ oggpackB_write@Base 1.1.0
+ oggpackB_writealign@Base 1.1.0
+ oggpackB_writecheck@Base 1.1.4~dfsg
+ oggpackB_writeclear@Base 1.1.0
+ oggpackB_writecopy@Base 1.1.0
+ oggpackB_writeinit@Base 1.1.0
+ oggpackB_writetrunc@Base 1.1.0
+ oggpack_adv1@Base 1.0rc3
+ oggpack_adv@Base 1.0rc3
+#DEPRECATED: 1.1.0# oggpack_adv_huff@Base 1.0rc3
+ oggpack_bits@Base 1.0rc3
+ oggpack_bytes@Base 1.0rc3
+ oggpack_get_buffer@Base 1.0rc3
+ oggpack_look1@Base 1.0rc3
+ oggpack_look@Base 1.0rc3
+#DEPRECATED: 1.1.0# oggpack_look_huff@Base 1.0rc3
+ oggpack_read1@Base 1.0rc3
+ oggpack_read@Base 1.0rc3
+ oggpack_readinit@Base 1.0rc3
+ oggpack_reset@Base 1.0rc3
+ oggpack_write@Base 1.0rc3
+ oggpack_writealign@Base 1.1.0
+ oggpack_writecheck@Base 1.1.4~dfsg
+ oggpack_writeclear@Base 1.0rc3
+ oggpack_writecopy@Base 1.1.0
+ oggpack_writeinit@Base 1.0rc3
+ oggpack_writetrunc@Base 1.1.0

diff --git a/debian/rules b/debian/rules
new file mode 100644 (file)
index 0000000..e70b976
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,83 @@
+#! /usr/bin/make -f
+
+NUM_CPUS = $(shell getconf _NPROCESSORS_ONLN 2>/dev/null)
+PARALLEL = $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NJOBS    = -j$(or $(PARALLEL),$(NUM_CPUS),1)
+
+
+export DH_OPTIONS
+
+# Keep dpkg-buildpackage the hell out of messing with our compile flags,
+# we should trust upstream to know better than it what to use here.
+# We do append -g for release builds though, for the detached -dbg package.
+CPPFLAGS =
+CFLAGS   = -g
+CXXFLAGS = -g
+LDFLAGS  =
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS = -Wall -g -O0
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+       INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+objdir = objs
+
+
+clean:
+       dh_testdir
+       dh_testroot
+       $(RM) build-stamp install-stamp
+       $(RM) -r $(objdir)
+       dh_clean
+
+
+$(objdir)/config.status: configure
+       dh_testdir
+       mkdir -p $(objdir)
+       cd $(objdir) && ../configure --enable-static                    \
+                                    --prefix=/usr
+
+build: build-stamp
+build-stamp: $(objdir)/config.status
+       dh_testdir
+       $(MAKE) $(NJOBS) -C $(objdir)
+       touch $@
+
+
+install: install-stamp
+install-stamp:
+       dh_testdir
+       $(MAKE) -C $(objdir) install DESTDIR=$(CURDIR)/debian/tmp
+       touch $@ 
+
+
+binary: binary-arch
+
+binary-arch: DH_OPTIONS = -a
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_install --sourcedir=debian/tmp
+       dh_installdocs
+       dh_installchangelogs CHANGES
+       dh_strip --dbg-package=libogg-dbg
+#      dh_strip 
+       dh_compress
+       dh_fixperms
+       dh_makeshlibs -V -- -c4
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary-indep:
+
+
+.PHONY: clean build install binary binary-arch binary-indep

diff --git a/libogg.manifest b/libogg.manifest
new file mode 100755 (executable)
index 0000000..a76fdba
--- /dev/null
+++ b/libogg.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/packaging/libogg.spec b/packaging/libogg.spec
index 34b387c..037b762 100644 (file)
--- a/packaging/libogg.spec
+++ b/packaging/libogg.spec
@@ -1,9 +1,10 @@
+#sbs-git:slp/unmodified/libogg libogg 1.2.1 66cb95f63390bb63c54636de14c71b86dcdad410
 Name:       libogg
 Summary:    The Ogg bitstream file format library
 Version:    1.2.1
-Release:    2
+Release:    3
 Group:      System/Libraries
-License:    BSD
+License:    BSD-2.0
 URL:        http://www.xiph.org/
 Source0:    http://downloads.xiph.org/releases/ogg/%{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
@@ -43,6 +44,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
 %postun -p /sbin/ldconfig
 
 %files
+%manifest libogg.manifest
 %{_libdir}/libogg.so.*
 
 %files devel

diff --git a/src/framing.c b/src/framing.c
index 25f0e88..b4adb36 100644 (file)
--- a/src/framing.c
+++ b/src/framing.c
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <ogg/ogg.h>
 
+#define GST_EXT_LIBOGG_MODIFICATION
+
 /* A complete description of Ogg framing exists in docs/framing.html */
 
 int ogg_page_version(const ogg_page *og){
@@ -696,9 +698,11 @@ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){
          at all) */
       /* replace the computed checksum with the one actually read in */
       memcpy(page+22,chksum,4);
-      
+
+#ifndef GST_EXT_LIBOGG_MODIFICATION
       /* Bad checksum. Lose sync */
       goto sync_fail;
+#endif
     }
   }