[prev in list] [next in list] [prev in thread] [next in thread]
List: xine-cvslog
Subject: [xine-cvs] HG: xine-lib-1.2: Move base64 header to xine-utils as we
From: "=?UTF-8?Q?Diego=20'Flameeyes'=20Petten=C3=B2?=" <flameeyes () gmail ! com>
Date: 2008-01-27 13:00:16
Message-ID: 7de550540e6e5f8badf8.1201438353 () hg ! debian ! org
[Download RAW message or body]
# HG changeset patch
# User Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
# Date 1201438353 -3600
# Node ID 7de550540e6e5f8badf8f205ec3abce6d586274c
# Parent 11a688202cbb33133dc34e972973635bcce6543b
Move base64 header to xine-utils as we don't want it installed.
diff -r 7de550540e6e5f8badf8f205ec3abce6d586274c -r \
11a688202cbb33133dc34e972973635bcce6543b include/xine/xineutils.h
--- a/include/xine/xineutils.h Sun Jan 27 13:52:33 2008 +0100
+++ b/include/xine/xineutils.h Sun Jan 27 13:10:07 2008 +0100
@@ -47,7 +47,6 @@ extern "C" {
#include <xine/list.h>
#include <xine/array.h>
#include <xine/sorted_array.h>
-#include <xine/base64.h>
#include <stdio.h>
#include <string.h>
diff -r 7de550540e6e5f8badf8f205ec3abce6d586274c -r \
11a688202cbb33133dc34e972973635bcce6543b src/input/input_cdda.c
--- a/src/input/input_cdda.c Sun Jan 27 13:52:33 2008 +0100
+++ b/src/input/input_cdda.c Sun Jan 27 13:10:07 2008 +0100
@@ -69,6 +69,7 @@
#include <xine/xineutils.h>
#include <xine/input_plugin.h>
#include "media_helper.h"
+#include "base64.h"
#if defined(__sun)
#define DEFAULT_CDDA_DEVICE "/vol/dev/aliases/cdrom0"
diff -r 7de550540e6e5f8badf8f205ec3abce6d586274c -r \
11a688202cbb33133dc34e972973635bcce6543b src/xine-engine/configfile.c
--- a/src/xine-engine/configfile.c Sun Jan 27 13:52:33 2008 +0100
+++ b/src/xine-engine/configfile.c Sun Jan 27 13:10:07 2008 +0100
@@ -33,6 +33,7 @@
#include <unistd.h>
#include <xine/configfile.h>
#include "bswap.h"
+#include "base64.h"
#define LOG_MODULE "configfile"
#define LOG_VERBOSE
diff -r 7de550540e6e5f8badf8f205ec3abce6d586274c -r \
11a688202cbb33133dc34e972973635bcce6543b src/xine-utils/Makefile.am
--- a/src/xine-utils/Makefile.am Sun Jan 27 13:52:33 2008 +0100
+++ b/src/xine-utils/Makefile.am Sun Jan 27 13:10:07 2008 +0100
@@ -16,6 +16,7 @@ endif
endif
libxineutils_la_SOURCES = $(pppc_files) \
+ base64.h \
base64.c \
cpu_accel.c \
color.c \
diff -r 7de550540e6e5f8badf8f205ec3abce6d586274c -r \
11a688202cbb33133dc34e972973635bcce6543b src/xine-utils/base64.c
--- a/src/xine-utils/base64.c Sun Jan 27 13:52:33 2008 +0100
+++ b/src/xine-utils/base64.c Sun Jan 27 13:10:07 2008 +0100
@@ -92,7 +92,7 @@
#include <time.h>
#include <stdlib.h>
-#include <xine/base64.h>
+#include "base64.h"
/* NOTE: This is not true RFC822 anymore. The use of the characters
diff -r 7de550540e6e5f8badf8f205ec3abce6d586274c -r \
11a688202cbb33133dc34e972973635bcce6543b src/xine-utils/base64.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xine-utils/base64.h Sun Jan 27 13:10:07 2008 +0100
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2000 Robert Kaye
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine 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.
+ *
+ * xine 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, USA
+ *
+ * Base64 encoding modified for Musicbrainz
+ * relicensed under the GNU General Public License for use in xine-lib
+ */
+/* --------------------------------------------------------------------------
+
+ MusicBrainz -- The Internet music metadatabase
+
+ Copyright (C) 2000 Robert Kaye
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+
+----------------------------------------------------------------------------*/
+/*
+ * Program: RFC-822 routines (originally from SMTP)
+ *
+ * Author: Mark Crispin
+ * Networks and Distributed Computing
+ * Computing & Communications
+ * University of Washington
+ * Administration Building, AG-44
+ * Seattle, WA 98195
+ * Internet: MRC@CAC.Washington.EDU
+ *
+ * Date: 27 July 1988
+ * Last Edited: 10 September 1998
+ *
+ * Sponsorship: The original version of this work was developed in the
+ * Symbolic Systems Resources Group of the Knowledge Systems
+ * Laboratory at Stanford University in 1987-88, and was funded
+ * by the Biomedical Research Technology Program of the National
+ * Institutes of Health under grant number RR-00785.
+ *
+ * Original version Copyright 1988 by The Leland Stanford Junior University
+ * Copyright 1998 by the University of Washington
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notices appear in all copies and that both the
+ * above copyright notices and this permission notice appear in supporting
+ * documentation, and that the name of the University of Washington or The
+ * Leland Stanford Junior University not be used in advertising or publicity
+ * pertaining to distribution of the software without specific, written prior
+ * permission. This software is made available "as is", and
+ * THE UNIVERSITY OF WASHINGTON AND THE LELAND STANFORD JUNIOR UNIVERSITY
+ * DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
+ * WASHINGTON OR THE LELAND STANFORD JUNIOR UNIVERSITY BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef BASE64_H
+#define BASE64_H
+
+unsigned char *xine_rfc822_binary (void *src,unsigned long srcl,unsigned long *len) \
XINE_PROTECTED; +
+char *xine_base64_encode (const void *src, unsigned long srcl, unsigned long *len) \
XINE_PROTECTED; +void *xine_base64_decode (const char *src, unsigned long srcl, \
unsigned long *len) XINE_PROTECTED; +
+#endif
diff -r 7de550540e6e5f8badf8f205ec3abce6d586274c -r \
11a688202cbb33133dc34e972973635bcce6543b include/xine/base64.h
--- a/include/xine/base64.h Sun Jan 27 13:52:33 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2000 Robert Kaye
- *
- * This file is part of xine, a free video player.
- *
- * xine 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.
- *
- * xine 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, USA
- *
- * Base64 encoding modified for Musicbrainz
- * relicensed under the GNU General Public License for use in xine-lib
- */
-/* --------------------------------------------------------------------------
-
- MusicBrainz -- The Internet music metadatabase
-
- Copyright (C) 2000 Robert Kaye
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
-
-----------------------------------------------------------------------------*/
-/*
- * Program: RFC-822 routines (originally from SMTP)
- *
- * Author: Mark Crispin
- * Networks and Distributed Computing
- * Computing & Communications
- * University of Washington
- * Administration Building, AG-44
- * Seattle, WA 98195
- * Internet: MRC@CAC.Washington.EDU
- *
- * Date: 27 July 1988
- * Last Edited: 10 September 1998
- *
- * Sponsorship: The original version of this work was developed in the
- * Symbolic Systems Resources Group of the Knowledge Systems
- * Laboratory at Stanford University in 1987-88, and was funded
- * by the Biomedical Research Technology Program of the National
- * Institutes of Health under grant number RR-00785.
- *
- * Original version Copyright 1988 by The Leland Stanford Junior University
- * Copyright 1998 by the University of Washington
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notices appear in all copies and that both the
- * above copyright notices and this permission notice appear in supporting
- * documentation, and that the name of the University of Washington or The
- * Leland Stanford Junior University not be used in advertising or publicity
- * pertaining to distribution of the software without specific, written prior
- * permission. This software is made available "as is", and
- * THE UNIVERSITY OF WASHINGTON AND THE LELAND STANFORD JUNIOR UNIVERSITY
- * DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD TO THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
- * WASHINGTON OR THE LELAND STANFORD JUNIOR UNIVERSITY BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, TORT (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef BASE64_H
-#define BASE64_H
-
-unsigned char *xine_rfc822_binary (void *src,unsigned long srcl,unsigned long *len) \
XINE_PROTECTED;
-
-char *xine_base64_encode (const void *src, unsigned long srcl, unsigned long *len) \
XINE_PROTECTED;
-void *xine_base64_decode (const char *src, unsigned long srcl, unsigned long *len) \
XINE_PROTECTED;
-
-#endif
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic