--- bombono-dvd-0.5.2.orig/debian/rules +++ bombono-dvd-0.5.2/debian/rules @@ -0,0 +1,93 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else + CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + +ifeq ($(NCPUS),-1) + NCPUS:=1 +endif + +ifeq ($(NCPUS),0) + NCPUS:=1 +endif + +CC:=ccache $(CC) +CXX:=ccache $(CXX) + +build: build-stamp +build-stamp: debian/stamp-patched + dh_testdir + + scons CFLAGS="-Wno-extra" USE_EXT_BOOST=true PREFIX=/usr \ + BOOST_LIBPATH=/usr/include/boost DESTDIR=$(CURDIR)/debian/tmp \ + CC="$(CC)" CXX="$(CXX)" -j $(NCPUS) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ -f build ] || rm -rf build + + dh_clean config.log tools/scripts/*.pyc config.opts + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + scons CFLAGS="-Wno-extra" USE_EXT_BOOST=true PREFIX=/usr \ + BOOST_LIBPATH=/usr/include/boost DESTDIR=$(CURDIR)/debian/tmp \ + CC="$(CC)" CXX="$(CXX)" -j $(NCPUS) install + + dh_install --fail-missing + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installchangelogs -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs -a + dh_installchangelogs -a + dh_installman -a + dh_installinit -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- bombono-dvd-0.5.2.orig/debian/manpages +++ bombono-dvd-0.5.2/debian/manpages @@ -0,0 +1,2 @@ +debian/bombono-dvd.1 +debian/mpeg2demux.1 --- bombono-dvd-0.5.2.orig/debian/bombono-dvd.1 +++ bombono-dvd-0.5.2/debian/bombono-dvd.1 @@ -0,0 +1,17 @@ +.\" Doc: http://www.kernel.org/doc/man-pages/online/pages/man7/man-pages.7.html +.\" +.\" First parameter, NAME, should be all caps +.TH "BOMBONO DVD" 1 "30 October 2009" +.SH NAME +bombono-dvd \- DVD authoring program with nice and clean GUI + +.SH SYNOPSIS +.B bombono-dvd + +.SH DESCRIPTION +See http://www.bombono.org +.SH "SEE ALSO" +\fBmpeg2demux\fP(1) + +.SH AUTHOR +Bombono DVD was written by Ilya Murav'jov . --- bombono-dvd-0.5.2.orig/debian/bombono-dvd-data.install +++ bombono-dvd-0.5.2/debian/bombono-dvd-data.install @@ -0,0 +1 @@ +usr/share --- bombono-dvd-0.5.2.orig/debian/copyright +++ bombono-dvd-0.5.2/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Ilya Murav'jov on +Thu, 25 Jun 2009 18:01:22 +0400. + +It was downloaded from: http://www.bombono.org + +Upstream Authors: Ilya Murav'jov + +License: + + Copyright (c) 2007-2009 Ilya Murav'jov + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + + --- bombono-dvd-0.5.2.orig/debian/changelog +++ bombono-dvd-0.5.2/debian/changelog @@ -0,0 +1,47 @@ +bombono-dvd (0.5.2-0.3) unstable; urgency=low + + * debian/rules replace dh_installmanpages by dh_installman otherwise + unwanted manpages are installed. + + -- Christian Marillat Wed, 11 Nov 2009 10:04:55 +0100 + +bombono-dvd (0.5.2-0.2) unstable; urgency=low + + * Should depends on scons. + * Add an upstream patch to fix a bug when /proc/scsi/sg/devices is + missing. + * Added mpeg2demux and bombono-dvd manpages from upstream author. + + -- Christian Marillat Sun, 08 Nov 2009 12:22:49 +0100 + +bombono-dvd (0.5.2-0.1) unstable; urgency=low + + * Delete generated config.opts file. + * Add more option for sparc. + + -- Christian Marillat Fri, 06 Nov 2009 22:09:31 +0100 + +bombono-dvd (0.5.2-0.0) unstable; urgency=low + + * First upload to my repository. + + -- Christian Marillat Wed, 04 Nov 2009 11:44:54 +0100 + +bombono-dvd (0.5.2-1) unstable; urgency=low + + * New upstream release. + + -- Ilya Murav'jov Thu, 24 Sep 2009 14:19:30 +0400 + +bombono-dvd (0.5.1-1) unstable; urgency=low + + * New upstream release. + + -- Ilya Murav'jov Sun, 6 Sep 2009 23:25:15 +0400 + +bombono-dvd (0.5-1) unstable; urgency=low + + * Initial Release. + + -- Ilya Murav'jov Thu, 25 Jun 2009 18:01:22 +0400 + --- bombono-dvd-0.5.2.orig/debian/control +++ bombono-dvd-0.5.2/debian/control @@ -0,0 +1,30 @@ +Source: bombono-dvd +Section: graphics +Priority: optional +Maintainer: Christian Marillat +Bugs: mailto:marillat@debian.org +Standards-Version: 3.8.3 +Homepage: http://www.bombono.org +Build-Depends: debhelper (>= 7), scons, libdvdread-dev, libgtkmm-2.4-dev, + libxml++2.6-dev, libmjpegtools-dev, libgraphicsmagick++1-dev, ccache, + libboost-filesystem1.40-dev, libboost-regex1.40-dev, quilt + +Package: bombono-dvd +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python, dvdauthor, mjpegtools, dvd+rw-tools, twolame, bombono-dvd-data, scons +Suggests: totem +Description: DVD authoring program with nice and clean GUI + Bombono DVD is easy to use program for making DVD-Video. + The main features of Bombono DVD are: + * excellent MPEG viewer: Timeline and Monitor + * real WYSIWYG Menu Editor with live thumbnails + * comfortable Drag-N-Drop support + * you can author to folder, make ISO-image or burn directly to DVD + * reauthoring: you can import video from DVD discs. + +Package: bombono-dvd-data +Architecture: all +Enhances: bombono-dvd +Description: Common data for bombono-dvd + This package contains architecture-independent data files needed by + bombono-dvd. --- bombono-dvd-0.5.2.orig/debian/install +++ bombono-dvd-0.5.2/debian/install @@ -0,0 +1 @@ +usr/bin --- bombono-dvd-0.5.2.orig/debian/README.source +++ bombono-dvd-0.5.2/debian/README.source @@ -0,0 +1,2 @@ + +See /usr/share/doc/quilt/README.source --- bombono-dvd-0.5.2.orig/debian/watch +++ bombono-dvd-0.5.2/debian/watch @@ -0,0 +1,23 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to examine a Webpage +# +#http://www.example.com/downloads.php bombono-dvd-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/bombono-dvd-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/bombono-dvd-(.*)\.tar\.gz debian uupdate + +# Uncomment to find new files on sourceforge, for devscripts >= 2.9 +# http://sf.net/bombono-dvd/bombono-dvd-(.*)\.tar\.gz + +# Uncomment to find new files on GooglePages +# http://example.googlepages.com/foo.html bombono-dvd-(.*)\.tar\.gz --- bombono-dvd-0.5.2.orig/debian/compat +++ bombono-dvd-0.5.2/debian/compat @@ -0,0 +1 @@ +7 --- bombono-dvd-0.5.2.orig/debian/mpeg2demux.1 +++ bombono-dvd-0.5.2/debian/mpeg2demux.1 @@ -0,0 +1,24 @@ +.\" First parameter, NAME, should be all caps +.TH "MPEG2DEMUX" 1 "30 October 2009" + +.SH NAME +mpeg2demux \- demuxer for MPEG2 and VOB files. +.SH SYNOPSIS +.B mpeg2demux +.IR src-file +.IR dst-file-w/o-extension + +.SH DESCRIPTION +Demux video from src-file(.mpg, .vob). If +.IR src-file +has .vob extension then ac3/dts/lpcm audios are to be pulled too. +.PP +If there is a lpcm audio in +.IR src-file +it will have info for mplex muxer in its name, how to mux with -L option. + +.SH "SEE ALSO" +\fBbombono-dvd\fP(1) + +.SH AUTHOR +Ilya Murav'jov --- bombono-dvd-0.5.2.orig/debian/patches/02_sparc.diff +++ bombono-dvd-0.5.2/debian/patches/02_sparc.diff @@ -0,0 +1,14 @@ +Index: bombono-dvd-0.5.2/libs/mpeg2dec/SConscript +=================================================================== +--- bombono-dvd-0.5.2.orig/libs/mpeg2dec/SConscript 2009-11-06 22:08:30.000000000 +0100 ++++ bombono-dvd-0.5.2/libs/mpeg2dec/SConscript 2009-11-06 22:09:11.000000000 +0100 +@@ -43,6 +43,9 @@ + # elif BuildVars.IsSparcArch(): + # cflags += ['-mcpu=ultrasparc', '-mvis'] + ++if BuildVars.IsSparcArch(): ++ cflags += ['-mcpu=ultrasparc', '-mvis'] ++ + # + libmpeg2_env.Append(CCFLAGS = cflags, CPPDEFINES = defines) + --- bombono-dvd-0.5.2.orig/debian/patches/series +++ bombono-dvd-0.5.2/debian/patches/series @@ -0,0 +1,3 @@ +03_scsi.diff +01_toolame.diff +02_sparc.diff --- bombono-dvd-0.5.2.orig/debian/patches/03_scsi.diff +++ bombono-dvd-0.5.2/debian/patches/03_scsi.diff @@ -0,0 +1,133 @@ +Index: bombono-dvd-0.5.2/src/mcomposite/mmedia.cpp +=================================================================== +--- bombono-dvd-0.5.2.orig/src/mcomposite/mmedia.cpp 2009-11-08 12:15:51.000000000 +0100 ++++ bombono-dvd-0.5.2/src/mcomposite/mmedia.cpp 2009-11-08 12:17:04.000000000 +0100 +@@ -119,13 +119,13 @@ + img.modifyImage(); + img.type(MagickLib::TrueColorType); // неявный перевод в RGBColorspace + +-#if (MagickLibVersion < 0x030000) || ((MagickLibVersion >= 0x100000) && (MagickLibVersion < 0x300000)) ++#if (MagickLibVersion < 0x020000) || ((MagickLibVersion >= 0x100000) && (MagickLibVersion < 0x200000)) + // см. configure.ac: из-за превышения 9 номер интерфейса (major interface) увелич. в 10 раз +-#define GM2_ABI ++#define GM1_ABI + #endif + + // с интерфейса >= 3 (версия 1.3) инициализация проходит при первом обращении Pixels::set|getConst() +-#ifdef GM2_ABI ++#ifdef GM1_ABI + // 2 - выделить и инициализировать ресурсы для хранения собственно + // данных и кеша представлений + MagickLib::OpenCache(img.image(), MagickLib::IOMode); +Index: bombono-dvd-0.5.2/src/mgui/author/burn.cpp +=================================================================== +--- bombono-dvd-0.5.2.orig/src/mgui/author/burn.cpp 2009-11-08 12:17:19.000000000 +0100 ++++ bombono-dvd-0.5.2/src/mgui/author/burn.cpp 2009-11-08 12:17:56.000000000 +0100 +@@ -39,7 +39,7 @@ + const gchar *device_node, const gint capabilities) + { + // нам нужны резаки DVD +- if( capabilities & DC_WRITE_DVDR ) ++ if( device_name && (capabilities & DC_WRITE_DVDR) ) + { + //io::cout << "model = " << device_name << ", dev = " << device_node + // << ", capabilities = " << capabilities << ", device_id = " << device_id << io::endl; +Index: bombono-dvd-0.5.2/src/mgui/author/gb_devices.c +=================================================================== +--- bombono-dvd-0.5.2.orig/src/mgui/author/gb_devices.c 2009-11-08 12:18:10.000000000 +0100 ++++ bombono-dvd-0.5.2/src/mgui/author/gb_devices.c 2009-11-08 12:22:42.000000000 +0100 +@@ -48,19 +48,26 @@ + + gboolean show_trace = FALSE; + +-gchar** +-gbcommon_get_file_as_list(const gchar *file) ++static gchar* ++get_file_contents(const gchar *file) + { + GB_LOG_FUNC + g_return_val_if_fail(file != NULL, NULL); + +- gchar **ret = NULL; + gchar *contents = NULL; +- if(g_file_get_contents(file, &contents, NULL, NULL)) +- ret = g_strsplit(contents, "\n", 0); +- else +- g_warning("gbcommon_get_file_as_list - Failed to get contents of file [%s]", file); ++ if( !g_file_get_contents(file, &contents, NULL, NULL) ) ++ g_warning("get_file_contents - Failed to get contents of file [%s]", file); + ++ return contents; ++} ++ ++gchar** ++gbcommon_get_file_as_list(const gchar *file) ++{ ++ gchar **ret = NULL; ++ gchar *contents = get_file_contents(file); ++ if( contents ) ++ ret = g_strsplit(contents, "\n", 0); + g_free(contents); + return ret; + } +@@ -82,9 +89,10 @@ + g_return_if_fail(model_name != NULL); + g_return_if_fail(device_id != NULL); + GB_TRACE("devices_get_ide_device - probing [%s]\n", device_node); +- gchar *contents = NULL; ++ + gchar *file = g_strdup_printf("/proc/ide/%s/model", device_node); +- if(g_file_get_contents(file, &contents, NULL, NULL)) ++ gchar *contents = get_file_contents(file); ++ if( contents ) + { + g_strstrip(contents); + *model_name = g_strdup(contents); +@@ -92,12 +100,37 @@ + g_free(contents); + } + else +- { ++ + g_warning("devices_get_ide_device - Failed to open %s", file); +- } ++ + g_free(file); + } + ++static char* get_sysfs_attr(const gchar* dev, const gchar* attr) ++{ ++ g_return_val_if_fail(dev != NULL, NULL); ++ gchar *file = g_strdup_printf("/sys/block/%s/device/%s", dev, attr); ++ ++ gchar *ret = get_file_contents(file); ++ if( ret ) ++ g_strstrip(ret); ++ g_free(file); ++ return ret; ++} ++ ++static char* get_sysfs_modelname(const gchar* dev) ++{ ++ gchar *model_name = NULL; ++ gchar* vendor = get_sysfs_attr(dev, "vendor"); ++ gchar* model = get_sysfs_attr(dev, "model"); ++ if( vendor && model ) ++ model_name = g_strdup_printf("%s %s", vendor, model); ++ ++ g_free(vendor); ++ g_free(model); ++ return model_name; ++} ++ + void + devices_get_scsi_device(const gchar *device_node, const gchar *device_node_path, + gchar **model_name, gchar **device_id) +@@ -112,6 +145,7 @@ + if((devices = gbcommon_get_file_as_list("/proc/scsi/sg/devices")) == NULL) + { + g_warning("devices_get_scsi_device - Failed to open /proc/scsi/sg/devices"); ++ *model_name = get_sysfs_modelname(device_node); + } + else if((device_strs = gbcommon_get_file_as_list("/proc/scsi/sg/device_strs")) == NULL) + { --- bombono-dvd-0.5.2.orig/debian/patches/01_toolame.diff +++ bombono-dvd-0.5.2/debian/patches/01_toolame.diff @@ -0,0 +1,30 @@ +Index: bombono-dvd-0.5.2/resources/scons_authoring/SConstruct +=================================================================== +--- bombono-dvd-0.5.2.orig/resources/scons_authoring/SConstruct 2009-11-08 12:12:26.000000000 +0100 ++++ bombono-dvd-0.5.2/resources/scons_authoring/SConstruct 2009-11-08 12:14:02.000000000 +0100 +@@ -16,23 +16,10 @@ + + # звук тишины для неподвижных меню + def GetkHzArgForToolame(kHz): +- import os +- import re +- #s = "tooLAME version 0.2l" +- s = os.popen("toolame -v").read() +- #print s +- +- m = re.compile("tooLAME version 0\.2(.)", re.M).search(s) +- +- res = kHz +- if m and m.group(1) == 'l': +- pass # classic toolame +- else: +- res = res * 1000 # twolame or similar +- return res ++ return kHz * 1000 + + argHz = GetkHzArgForToolame(48) +-Command('Silent.mp2', [], "dd if=/dev/zero bs=4 count=1920 | toolame -b 128 -s %d /dev/stdin $TARGET" % argHz) ++Command('Silent.mp2', [], "dd if=/dev/zero bs=4 count=1920 | twolame -b 128 -s %d -r - $TARGET" % argHz) + + # основная функция создания меню + import ADVD